Commit Graph

12523 Commits

Author SHA1 Message Date
Andreas Huber
e27f6940c7 Merge "During shutdown, don't loop forever on a state transition to OMX_StateInvalid." 2010-02-09 10:04:57 -08:00
San Mehat
160be5c646 Merge "NativeDaemonConnector: Improve error reporting and debug formatting" 2010-02-09 08:59:13 -08:00
San Mehat
4d0b9139e2 Merge changes I1aabef01,I8dbd0f83
* changes:
  SystemServer: Move MountService startup before NotificationManagerService
  StorageManager: Check for a null MountService
2010-02-09 08:58:23 -08:00
Leon Scroggins
0d57dc8da2 Merge "Handle the Tab key by moving to the next textfield. And ensure there is always a way to get to the next field." 2010-02-09 07:53:40 -08:00
Suchi Amalapurapu
83d5c71304 resolved conflicts for merge of 37a00a36 to master 2010-02-08 23:55:56 -08:00
Andy Stadler
b2a5affce5 Merge "Fixes to DeviceAdmin & DevicePolicyManager Javadoc" 2010-02-08 23:06:31 -08:00
Suchi Amalapurapu
ddd670c816 am 08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.
Merge commit '08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp

* commit '08be55b8ea917a5273c135a7bdc73e41c8524c05':
  Add null checks when scanning a package.
2010-02-08 17:27:33 -08:00
Andreas Huber
2a2fb8a362 Merge "Properly implement asynchronous preparation of media playback." 2010-02-08 16:39:24 -08:00
Jason Sams
19c78c9988 Merge "Fix fountain and put the demos back in the optional build." 2010-02-08 16:34:04 -08:00
Chris Tate
94ac2b0ed5 Merge "Remember which apps have available restore info in the ancestral dataset" 2010-02-08 16:30:35 -08:00
Marco Nelissen
675c6ae717 Merge "Skip the endianness marker when converting UCS-2 to UTF-8, since it ends up in the UTF-8 string otherwise." 2010-02-08 16:30:14 -08:00
Gloria Wang
a6ce146906 Merge "Use Tremor for sim-eng, and Tremolo for other targets." 2010-02-08 15:16:07 -08:00
Marco Nelissen
b0afa790d1 Merge "Add support for the TPOS/TPA (disc number) id3 tag." 2010-02-08 14:59:31 -08:00
Romain Guy
2ca86fcb81 Merge "Always remember the last touch mode state when touch mode changes." 2010-02-08 14:59:03 -08:00
Suchi Amalapurapu
9a708ffb12 Merge "Rename media resource broadcasts Add checks for fwdlocked and updated system apps add more tests remove duplicate adds" 2010-02-08 14:51:38 -08:00
Charles Chen
c75e5e0ccf Merge "Fixing a race condition in the TextToSpeech service that could be triggered if many long utterances are started and interrupted in rapid succession." 2010-02-08 14:44:44 -08:00
Joe Onorato
bf1a365b66 Merge "Make ComponentName cloneable." 2010-02-08 13:10:46 -08:00
Romain Guy
7c22a2f2b0 Merge "Prevent crash in KeyboardView when the view is 0x0." 2010-02-08 13:06:17 -08:00
Doug Zongker
1b26c6ae58 Merge "add explicit Base64.DEFAULT flag to request default behavior" 2010-02-08 11:16:59 -08:00
Doug Zongker
34d472b768 add explicit Base64.DEFAULT flag to request default behavior
Also fix some grammar problems in the javadoc, and prevent the class
from being instantiated.

Change-Id: I4d83184236566a1e77d5f5cce1c4dd3776bcfca3
2010-02-08 11:16:20 -08:00
Vasu Nori
f689910bb9 Merge "use sqlite 3.6.22 to print and profile the sql statetements" 2010-02-08 10:59:38 -08:00
Gloria Wang
06553a4eef Merge "Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first." 2010-02-08 10:46:36 -08:00
The Android Open Source Project
54ad88ea69 am ad9bcb22: merge from open-source master
Merge commit 'ad9bcb22d05fbf130ac64254abd51a137e9a3d3f'

* commit 'ad9bcb22d05fbf130ac64254abd51a137e9a3d3f':
  Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method
  Fixed Android animation framework, for using interpolators that do not start at 0.0f
  Fix for GPS engines without separate session and engine status events.
  Be tolerant of GPS session and engine on status messages arriving out of order.
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
2010-02-08 09:17:10 -08:00
Bjorn Bringert
9b692da2e3 Merge "Fixing a bug when installing VoiceSearch cause error" 2010-02-08 06:20:08 -08:00
Vasu Nori
c3632c37ba Merge "fix a warning message that is confusing people." 2010-02-05 21:37:42 -08:00
Gloria Wang
c5d960637c Merge "Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"" 2010-02-05 19:06:38 -08:00
Chia-chi Yeh
1ca8e76925 Merge "KeyStore: minor improvements." 2010-02-05 18:46:58 -08:00
Mathias Agopian
82c19b101e Merge "fix [2189862] Race condition in eglIntialize and eglDestroy" 2010-02-05 18:37:17 -08:00
Adam Powell
8ff3d4c257 Merge "ListView updates. Fixed several overscrolling bugs. Added programmatic scrolling to ListView. Added auto-scrolling to show expanded content for ExpandableListView. Fixed an AbsListView recycler bug where offscreen views would stick around in the view hierarchy." 2010-02-05 18:01:45 -08:00
Charles Chen
eeafed7da3 Merge "Fixing a bug with the TextToSpeech speech queue processing. The queue processor should not be called for the next item until synthesis has actually happened for the current item; before it was being incorrectly called regardless of whether or not the synthesizer had processed the current item." 2010-02-05 17:23:44 -08:00
Mathias Agopian
75bc27803e fix [2189862] Race condition in eglIntialize and eglDestroy
there is now a lock protext a perticular display. it's held during
initialization and destruction.
2010-02-05 16:17:01 -08:00
Romain Guy
b12527fe5a Merge "Do not let negative margins reduce the size of the LinearLayout." 2010-02-05 15:35:10 -08:00
Gloria Wang
b25a0db432 Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)" 2010-02-05 15:18:37 -08:00
The Android Open Source Project
9517d61887 am 0af04493: am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '0af0449301e72a52beeed8f26021e5460004d67a'

* commit '0af0449301e72a52beeed8f26021e5460004d67a':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
2010-02-05 14:23:32 -08:00
The Android Open Source Project
f8155987ae merge from open-source master 2010-02-05 13:55:16 -08:00
Mathias Agopian
a75c7f1113 Merge "Add support for direct EGLImageKHR use with pushbuffer API" 2010-02-05 13:44:01 -08:00
Mathias Agopian
f637ebe3fa Merge "Proper EGLImageKHR error handling" 2010-02-05 13:43:50 -08:00
Romain Guy
1222661c8c Merge "Fix dialogs to occupy more space." 2010-02-05 13:00:06 -08:00
Ken Shirriff
d93cef9a3f Merge "Make ACCOUNT_NAME/ACCOUNT_TYPE consistent." 2010-02-05 12:45:15 -08:00
Chris Tate
ff8b1596d6 Merge "Don't hold the backup queue lock across a backup operation" 2010-02-05 12:38:51 -08:00
Mike Lockwood
f877076a1b Merge "Keep automatic screen brightness monotonically increasing until screen is turned off." 2010-02-05 12:38:02 -08:00
James Dong
85fa67e11c Merge "When the extractor is not able to be created successfully, don't crash" 2010-02-05 12:05:42 -08:00
Romain Guy
6ba1ed8f31 Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method" 2010-02-05 10:33:44 -08:00
The Android Open Source Project
9f4247668e am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp

* commit '31bfdf695ef741f64066ef605bd6a7e23df88714':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
  Fix regression.
  Fix broken build.
  Bluetooth A2DP suspend/resume functionality
  EventLog when a database file is deleted due to corruption.
  Don't forget to clear "backup in progress" state when finishing a pass
  Fix issue #2148939: Sholes slow to wake up in landscape mode
  Fix Cdma re-start of default connection.
  Merge change 26821 into eclair
  Not all WebView's host have permission to read the history.
  Merge change 26908 into eclair
2010-02-05 08:48:38 -08:00
The Android Open Source Project
93fe6a1cee reconcile main tree with open-source eclair 2010-02-05 08:09:38 -08:00
Bjorn Bringert
6ad61d9a76 Merge "Adding speech recognition service public API" 2010-02-05 06:25:45 -08:00
Doug Zongker
52a0bb3857 Merge "rename encodeString to encodeToString" 2010-02-05 05:44:17 -08:00
Dan Egnor
8e83db5f24 Merge "Add ability to parse HTTP-format moratorium times (since pretty much every user wants this)." 2010-02-04 19:48:52 -08:00
James Dong
cea135806a Merge "Camcorder profile Java API support - Use Enum for Quality instead of int - Use static values() method from Enum, rather than if-else" 2010-02-04 17:50:05 -08:00
Mathias Agopian
a7e380396e Add support for direct EGLImageKHR use with pushbuffer API
We now always first try to use the EGLImageKHR directly before
making a copy with copybit. The copy may be needed when
EGLImage doesn't support the requested format, which is
currently the case with YUV.
2010-02-04 17:13:06 -08:00