Commit Graph

13157 Commits

Author SHA1 Message Date
Kenny Root
eb0c26709f Merge "Range check in MediaScanner::processDirectory" 2010-02-18 09:36:08 -08:00
Kenny Root
6e7441cee6 Merge "Store AudioTrack return value for error condition" 2010-02-18 09:24:42 -08:00
Mike Lockwood
34b33fca2a Merge "Catch Java exceptions in the FileObserver JNI code" 2010-02-18 07:47:53 -08:00
Mike Lockwood
df1a82b315 Merge "Don't return passive location provider unless app has fine permissions." 2010-02-18 06:38:12 -08:00
Cary Clark
e76e4bc12f Merge "add support for audio/3gpp" 2010-02-18 06:28:45 -08:00
Mike Reed
ca4cf38763 Merge "update dox" 2010-02-18 06:11:39 -08:00
Joe Onorato
e615f091b5 am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp

* commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af':
  Don't crash the system process when apps give us a bad foreground service notification.
2010-02-18 04:52:46 -08:00
Joe Onorato
4fdd7fd17a Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair 2010-02-18 04:46:32 -08:00
Romain Guy
d9e6976e60 am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp

* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
  Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
2010-02-17 21:22:52 -08:00
Romain Guy
2feec33de8 am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp

* commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e':
  Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
2010-02-17 21:17:48 -08:00
Romain Guy
71f13a1cc8 am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005.
Merge commit '8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp

* commit '8368ef0b670f8193f3161671b119e78b1fb659a1':
  Manual merge of 40080 DO NOT MERGE
2010-02-17 21:10:34 -08:00
Mathias Agopian
4734bd4e3f Merge "Remove a dependency of Region (libui) on Parcel (libbinder)." 2010-02-17 20:27:45 -08:00
Mathias Agopian
b6121422ef Remove a dependency of Region (libui) on Parcel (libbinder). 2010-02-17 20:26:47 -08:00
Dan Egnor
3283401e81 Add some useful methods to OperationScheduler to inquire into
the history, in case you want to second-guess its scheduling.
2010-02-17 17:07:01 -08:00
Andreas Huber
fde70b365f Merge "We are cancelling this event during reset, but the event may have already been dispatched at the time, blocking on the mutex. While it's blocking, reset() cancels the event, we're then unblocked and bad things(tm) happen." 2010-02-17 16:10:29 -08:00
Mike Lockwood
901ae7ea48 Merge "Add passive location provider." 2010-02-17 15:52:05 -08:00
Jason Sams
a44d34f762 Merge "Implement type collapsing for Elements and Types. Now if a user creates two or more identical objects we simply reuse the existing object rather than create a new one." 2010-02-17 15:39:46 -08:00
Kenny Root
a3df252d47 Merge "Prevent possible NPE in android.gesture.Learner" 2010-02-17 15:37:24 -08:00
Adam Powell
6afb9ab6c6 Merge "Don't move the fast scroll thumb with a list on overscroll." 2010-02-17 15:16:08 -08:00
Andreas Huber
bb3ad11883 Merge "Disable the TI AMR hardware decoder for audio decoding until its issues are resolved." 2010-02-17 15:06:51 -08:00
Andreas Huber
c7567cd2b9 Merge "Better diagnostics for the stagefright tool and codec performance." 2010-02-17 15:06:44 -08:00
Dave Sparks
8e34931c68 Merge "Unhide new SoundPool API's. Bug 2415373." 2010-02-17 13:37:55 -08:00
Brett Chabot
143e1f7983 Merge "Add a host based test for package manager installs." 2010-02-17 13:26:33 -08:00
Kenny Root
f003de86ef Merge "Correct use of logical AND" 2010-02-17 13:24:59 -08:00
Kenny Root
22135c056f Merge "Add better index checks for AndroidCharacter.mirror" 2010-02-17 13:24:37 -08:00
Kenny Root
80936a262f Merge "Fix cast to String[] in FullBackupAgent" 2010-02-17 13:00:25 -08:00
Kenny Root
3c8f46c8d8 Merge "Add hashCode() to BluetoothService$RemoteService" 2010-02-17 12:25:20 -08:00
Adam Powell
38f06365c4 Merge "XML attribute for overscrolling behavior" 2010-02-17 12:06:35 -08:00
Kenny Root
14289c9446 Merge "Prevent sign extension in IccUtils.parseToRGB" 2010-02-17 12:02:35 -08:00
Mike Cleron
b34c478346 Merge "Add the automatic handling of night/notnight UI modes." 2010-02-17 12:00:45 -08:00
Leon Scroggins
69bd0c955b Merge "Changes to remove WebTextView at end of touch/press rather than during." 2010-02-17 11:36:31 -08:00
Steve Block
0cbe948387 Merge "Sorts the lists of tests in DumpRenderTree in preparation for cleaning up the lists." 2010-02-17 11:25:28 -08:00
Steve Block
10ee6d375c Merge "Removes tests from DumpRenderTree skipped list where the corresponding bugs have been fixed." 2010-02-17 11:04:53 -08:00
Dmitri Plotnikov
62c766e5ee Merge "Adding support for "contact counts grouped by the first letter of the sort key"." 2010-02-17 10:58:10 -08:00
Dianne Hackborn
c062519396 Merge "Fix issue #2420412: API review: DeviceAdmin API changes" 2010-02-17 10:56:58 -08:00
San Mehat
592c2e3c09 Merge "NativeDaemonConnector: Improve bad list IPC diagnostics" 2010-02-17 10:55:44 -08:00
Eric Fischer
8c31d9b8f3 Merge "Enhance text docs, rename some variables for clarity, comment places in the code for further investigation." 2010-02-17 10:37:29 -08:00
Kenny Root
9d4d8b3fd1 Merge "Prevent sign extension in UsimPhoneBookManager" 2010-02-17 10:26:40 -08:00
San Mehat
c311fb440a Merge "framework: tests: Add some unit-tests for Asec" 2010-02-17 10:07:49 -08:00
Dave Sparks
52023fe06e Merge "Fix logging in SoundPool." 2010-02-17 09:16:43 -08:00
Jaikumar Ganesh
1a9adf6a16 Merge "AVRCP volume controls for the docks." 2010-02-17 09:16:19 -08:00
Jaikumar Ganesh
6927c58390 Merge "Fix issue 2440226: Car dock volume synchronization." 2010-02-17 09:15:50 -08:00
Bjorn Bringert
a540f79893 Merge "Clean up after failed MemoryFileTest.testPurge()" 2010-02-17 01:58:59 -08:00
Ben Cheng
40fedd6af0 Merge "Detect system-wide safe mode and configure the VM accordingly." 2010-02-16 22:28:20 -08:00
Mathias Agopian
29d174255d fix [2447659] fix improper usage of the YCbCr_420_SP format 2010-02-16 20:45:21 -08:00
Mathias Agopian
3db2164051 fix a bug I introduced recently where YUV formats would crash the system 2010-02-16 20:43:39 -08:00
San Mehat
40cece49dd Merge "MountService: Add API call for getting a list of pids currently using the specified mountpoint" 2010-02-16 18:07:31 -08:00
Mathias Agopian
a6fcb8b0e6 Merge "get rid off the YUV formats at the libui layer" 2010-02-16 18:00:13 -08:00
Mathias Agopian
54ed4f6282 get rid off the YUV formats at the libui layer 2010-02-16 17:33:37 -08:00
Chris Tate
c28f4b1557 Merge "Fix the build (mucked up an API change / commit / upload sequence)" 2010-02-16 17:21:39 -08:00