Suchi Amalapurapu
1e10d364f1
Merge "Move package from internal to external and vice versa."
2010-02-19 14:27:29 -08:00
Fred Quintana
a6a1005f76
Merge "improve logging of errors when trying to resolve backrefs http://b/2371475 "
2010-02-19 14:22:25 -08:00
Adam Powell
6d6dc332fb
Merge "Spinner now allows disabled adapter items"
2010-02-19 14:15:57 -08:00
Adam Powell
755e7010d3
Merge "Recycle MotionEvents properly in GestureDetector"
2010-02-19 14:15:19 -08:00
Jason Sams
c0bf17a471
Merge "Add test pattern icon to Fountain."
2010-02-19 13:27:24 -08:00
Kenny Root
434ae63806
Merge "Use direct reference to enum in AaptAssets"
2010-02-19 13:12:07 -08:00
Dan Egnor
7081de5973
Merge "Add some useful methods to OperationScheduler to inquire into the history, in case you want to second-guess its scheduling."
2010-02-19 11:14:35 -08:00
Steve Block
fe641b4824
Merge "Ignore TEMPLATE.html in LayoutTest directories"
2010-02-19 11:12:03 -08:00
Martin Hibdon
90f24938a4
Merge "Enable bluetooth voice dialing in BluetoothHeadset.java."
2010-02-19 10:56:47 -08:00
Fred Quintana
4b4f7c4ae1
Merge "- fix the AccountManager documentation. http://b/2401790 - only pass the authtoken through from the authenticator to the client for getAuthToken() and strip it out from the other calls, like addAccount(). http://b/2332762 - beef up the documentation to indicate what calls are allowed to be made from the main thread and which are not allowed. http://b/2384961 - wait a bit before retrying syncs that failed because one was already in progress. http://b/2414235 "
2010-02-19 10:46:36 -08:00
Steve Block
d1ae5cce45
Merge "Remove tests that no longer exist from the DumpRenderTree skipped list"
2010-02-19 10:45:28 -08:00
Steve Block
2506d4cd8f
Merge "Merges unused bug list with ignored result list in DumpRenderTree"
2010-02-19 10:45:00 -08:00
Andreas Huber
558dd77483
Merge "The MediaScanner is way too obsessed with restricting the files to be scanned."
2010-02-19 10:33:14 -08:00
Brett Chabot
d99dcc0b01
Merge "Move framework test-runner unit tests to be closer to their source. Move the test-runner source into a separate src folder to accommodate the test move."
2010-02-19 10:02:10 -08:00
San Mehat
52c5b35096
Merge "MountService: Move boot-time mount to a thread - avoids ANR at boot"
2010-02-19 09:57:29 -08:00
Steve Block
7d3fe88cd2
Merge "Makes sure GeolocationPermissions is fully robust to calls being made before the message handler is initialized"
2010-02-19 08:38:56 -08:00
Leon Scroggins
4709a7c42a
Merge "Change to 5 days ago group to 7 days ago."
2010-02-19 08:26:54 -08:00
Steve Block
dfd3f66537
Merge "Adds synchronization around message handler in GeolocationPermissions and WebStorage"
2010-02-19 08:22:37 -08:00
Andreas Huber
3861bd9319
Merge "Implement legacy behaviour for MediaPlayer's behaviour of starting from the start of the media on a start() call instead of resuming at the current position, if previously reached the end of the stream. Also properly report number of frames played to audio flinger. Finally, delay spawing the queue thread until actually used."
2010-02-19 08:02:57 -08:00
Andreas Huber
5c9137b398
Merge "Fix a race condition in the prefetcher, the source may be shutdown while we're reading data from it."
2010-02-19 08:02:48 -08:00
Mike LeBeau
447ba35442
Merge "Elaborate a little on the documentation for PackageManager's resolveActivity."
2010-02-18 20:11:51 -08:00
Mike LeBeau
ee4dcbc338
Merge "Two big additions to the voice recognition APIs:"
2010-02-18 20:10:23 -08:00
Jim Miller
ba08ff86c6
Merge "Fix 2455162: Fix mdpi password entry keyboard to show 'OK' instead of return icon."
2010-02-18 19:08:21 -08:00
Chih-Chung Chang
ade3c2334e
Merge "Do setThreadPriority() later so we can notify the waiting thread and release the lock as soon as possible even if we run the loop in background priority."
2010-02-18 17:36:00 -08:00
Robert Greenwalt
c1bab651b1
Merge "Add USB RNDIS enable/disable control"
2010-02-18 17:34:16 -08:00
San Mehat
8d5f06ea20
Merge "framework: tests: Clean up asec unit tests and add rename tests"
2010-02-18 16:49:18 -08:00
Vasu Nori
6b81b9c4ec
Merge "add diagnostic info to help debug bug:2427686"
2010-02-18 16:43:14 -08:00
Adam Powell
5ca3797540
Merge "Don't cache mFirstPosition before a layoutChildren in ListView.onFocusChanged"
2010-02-18 15:54:40 -08:00
Dianne Hackborn
7a260335e7
Merge "Fixing bug 2453467 - In case of a dead process while disabling Accessibility some processes keep sending AccessibilityEvents"
2010-02-18 15:49:25 -08:00
Joe Onorato
8fe2b7eec9
Merge "Fix 2363699 - Make notification shade animate closed when disabled"
2010-02-18 15:19:43 -08:00
Chih-Chung Chang
7fa0a784f9
Merge "Fix the rgb to yuv422sp conversion. The order of uv is different from the original version, but it should be ok as the original Y,Cb,Cr are all incorrect."
2010-02-18 14:43:05 -08:00
Bjorn Bringert
8c2b9f070a
Merge "Add SearchManager.getWebSearchActivity()"
2010-02-18 14:25:33 -08:00
Chih-Chung Chang
9cb6df5697
Fix the rgb to yuv422sp conversion. The order of uv is different from the
...
original version, but it should be ok as the original Y,Cb,Cr are all incorrect.
2010-02-18 14:02:56 -08:00
Jaikumar Ganesh
a3ac2e5dd8
Merge "Set error condition correctly when device is already created."
2010-02-18 13:46:33 -08:00
Kenny Root
c774b68c4c
Merge "Change buf size holding integer in ResourceTable"
2010-02-18 12:39:15 -08:00
Fabrice Di Meglio
76709c96a9
Merge "Fix bug #2331761 (Instances of a recurring event are missing)"
2010-02-18 11:18:34 -08:00
Marco Nelissen
bacea995b6
Merge "Make the simulator boot again."
2010-02-18 11:11:29 -08:00
Joe Onorato
46531891e2
am 6371a2d3: am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
...
Merge commit '6371a2d31f30b473e91be9cced64a2527c086af1'
* commit '6371a2d31f30b473e91be9cced64a2527c086af1':
Don't crash the system process when apps give us a bad foreground service notification.
2010-02-18 11:02:48 -08:00
Romain Guy
03282bb97d
am ab4835ee: (-s ours) am 00b17659: Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
...
Merge commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7'
* commit 'ab4835ee0df866a4f7982644742e2b758c50fdd7':
Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
2010-02-18 11:02:32 -08:00
Romain Guy
5e4324b5aa
am 6f4a52a3: (-s ours) am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
...
Merge commit '6f4a52a3f7c6bd87e7109d741441bff332a445a4'
* commit '6f4a52a3f7c6bd87e7109d741441bff332a445a4':
Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
2010-02-18 11:02:21 -08:00
Romain Guy
38be92f064
am 6c71d476: (-s ours) am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005 .
...
Merge commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a'
* commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a':
Manual merge of 40080 DO NOT MERGE
2010-02-18 11:02:11 -08:00
android-build SharedAccount
25bf68deab
am f8bb2a9a: (-s ours) am 5d72a8dd: cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
...
Merge commit 'f8bb2a9ad096071fb7d45c769d031b2e1853317e'
* commit 'f8bb2a9ad096071fb7d45c769d031b2e1853317e':
cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
2010-02-18 11:01:01 -08:00
Dianne Hackborn
fe1cd1a010
Merge "Fixing bug 2451615 - Accessibility services are started upon system reboot while accessibility is disabled"
2010-02-18 10:49:00 -08:00
Kenny Root
cd5058599e
Merge "Fix enum reference"
2010-02-18 10:47:25 -08:00
Dianne Hackborn
4b9ee9bc75
Merge "Fix for bug 2448479"
2010-02-18 10:46:45 -08:00
Gilles Debunne
a46f0692fb
Merge "List.GetCheckItemIds no longer includes unchecked items."
2010-02-18 10:26:34 -08:00
Kenny Root
2e5afbd0a7
Merge "Adjust SQLiteDatabase/Program buffer sizes"
2010-02-18 10:21:36 -08:00
Fred Quintana
80c860f5b1
Merge "remove check for obsolete property ro.config.sync"
2010-02-18 10:16:18 -08:00
Robert Greenwalt
db90ba5692
Merge "Add Java hookup to netd interface notifications."
2010-02-18 10:11:27 -08:00
Eric Rowe
d2f16c28c0
Merge "Fix formatting of ANRs."
2010-02-18 09:58:07 -08:00