Commit Graph

12791 Commits

Author SHA1 Message Date
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
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
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