Chia-chi Yeh
5bf4691382
Merge "keystore: add AID_ROOT into the user table."
2010-03-08 17:50:56 -08:00
Romain Guy
ca2dc3c804
Merge "Fix scrolling bug in AutoCompleteTextView. Bug #2495033 "
2010-03-08 17:46:36 -08:00
Chia-chi Yeh
e3bc023471
keystore: add AID_ROOT into the user table.
...
Change-Id: I4b9cf24d75ca79583d7913bbb2c33745a2316cde
2010-03-09 09:44:07 +08:00
The Android Open Source Project
975b1cb2d9
merge from open-source master
...
Change-Id: I66d3db4c9ed3f54ce17a8d64ca0c6cce6941cdaa
2010-03-08 17:14:25 -08:00
Daniel Lehmann
08e65b9ebd
Merge "Expose the Uri of the newly created contact Bug: 2448065"
2010-03-08 17:10:03 -08:00
Eric Fischer
d738ea02e4
Merge "Guard against calls to getTextAfterCursor() in text that has no cursor."
2010-03-08 16:59:48 -08:00
Tom Taylor
f65d947dd9
Merge "Remove mms-common library"
2010-03-08 16:35:38 -08:00
Robert Greenwalt
df4b5ff981
Merge "Update the Mcc Table for Canada."
2010-03-08 16:35:13 -08:00
Tom Taylor
30b85570ec
Remove mms-common library
...
Put the Mms files back in the framework where they've been since 1.0.
Change-Id: I3c449468053ddd82d35c45a06d71957de660bf99
2010-03-08 16:34:53 -08:00
Wu-cheng Li
4f24634301
Merge "Add camera parameter string constant for "true"."
2010-03-08 16:31:57 -08:00
Andreas Huber
7c3b7acb3b
Merge "The audio track was accidentally not participating in the prefetch since it wasn't started at the time prepare() was called. Also, properly report the cached duration even near the end when the source has no more data to fetch."
2010-03-08 16:02:16 -08:00
Mathias Agopian
f23a5e052e
Merge "fixes for [2474091] Saw Poor behaviour playing a video."
2010-03-08 15:35:44 -08:00
Dianne Hackborn
4d0e1ddf5d
Merge "Hold wake lock while shutting down."
2010-03-08 14:58:25 -08:00
Romain Guy
27f87856eb
Merge "Report scroll events from ScrollView and HorizontalScrollView. Bug #2342763 "
2010-03-08 14:44:00 -08:00
Andreas Huber
773694abb4
Merge "Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers."
2010-03-08 14:29:38 -08:00
Andreas Huber
c8766cfe08
Merge "Increase the amount of data buffered at preparation time. Make sure to start preparing after the codecs have been started, otherwise no buffering will happen."
2010-03-08 13:07:08 -08:00
Daniel Sandler
457848376c
Merge "Correct path to LowBattery.ogg."
2010-03-08 12:01:00 -08:00
Andreas Huber
a6068221a9
Merge "The prefetched source was unnecessarily holding a lock while receiving data from the network, sometimes blocking for seconds over 2G networks with corresponding drops in audio playback. Also, if the cache was full we'd report a cache duration of 0 instead of maximum size."
2010-03-08 11:24:47 -08:00
Mike LeBeau
b7b1482d01
Merge "Update comments for the new EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS."
2010-03-08 11:22:58 -08:00
Mathias Agopian
fcfeb4b597
fixes for [2474091] Saw Poor behaviour playing a video.
...
- fix a bug when hacking video buffers into gralloc buffers
where the buffer size was incorrect this was causing the
"direct-form-texture" mode to fail
- also when the above fails, make sure to revert to the
"mdp copy mode" before going to "slow mode"
- finally disable completely the "direct-from-texture" mode
for now. It cannot work because the allocated buffers can't
respect the GPU constraints (alignment and such). We'll
have to find a solution for that.
2010-03-08 11:14:20 -08:00
Vasu Nori
b7151f722c
Merge "caching bug in SQLiteDatabase causes invalid finalizer warnings"
2010-03-08 11:13:52 -08:00
Vasu Nori
c26f3abc94
Merge "rollback AFTER commit causes warning message from sqlite bug:2486731"
2010-03-08 11:08:10 -08:00
Steve Block
21b56e3d5d
Merge "Updates WebAddress to ignore the colon after the host component of a URL if no port is specified"
2010-03-08 10:43:38 -08:00
Leon Scroggins
f180bdac0f
Merge "Pass keys to plugin while shift is held down."
2010-03-08 10:42:42 -08:00
Patrick Scott
72cbb9fe72
Merge "If both cookies have null values, use the name difference."
2010-03-08 09:54:08 -08:00
Mike LeBeau
4d17c435fd
Merge "Adding support for passing HTTP headers to a Browser"
2010-03-08 09:41:10 -08:00
Eric Laurent
59bfca0cc1
Merge "Fix issue 2317760: Change the priority between wired headset and A2DP."
2010-03-08 09:40:15 -08:00
San Mehat
864dd7608e
Merge "dumpstate: Add secure container + mounted filesystems to bugreport"
2010-03-08 09:05:44 -08:00
Amith Yamasani
1f63783b10
Merge "Fix a SettingsProvider test : 2377540"
2010-03-08 09:02:31 -08:00
Patrick Scott
9f9b5d6c07
Merge "Cookies like "a=b" were broken due to my previous change."
2010-03-08 08:22:59 -08:00
Steve Block
d278d97a53
Merge "For synchronous loads, load file URLs in the WebCore thread, rather than in the new WebViewWorker thread"
2010-03-08 08:16:41 -08:00
Bjorn Bringert
ddc7f16a29
Merge "Fixing: Position of right button edge is different for VS"
2010-03-08 07:16:16 -08:00
Eric Laurent
219795f5d0
Fix issue 2317760: Change the priority between wired headset and A2DP.
...
Modified audio policy manager so that wired headset has precedence over A2DP headset.
2010-03-08 06:50:44 -08:00
Mike Lockwood
ef70c8971c
Merge "location: dump LocationProvider internal state"
2010-03-08 06:47:49 -08:00
Mike Reed
eb90a5a9b2
Merge "hidden api sameAs() to compare the pixels of 2 bitmaps for equality"
2010-03-08 05:54:42 -08:00
Bjorn Bringert
42b444025a
Merge "Hide Go button in browser when no text is entered"
2010-03-08 05:45:42 -08:00
Mike Lockwood
5e56a199ec
Merge "Disable car mode should not require DISABLE_KEYGUARD permission"
2010-03-08 04:12:28 -08:00
Chia-chi Yeh
0755483539
keystore: allow '\0's in keys and add guards for cplusplus.
...
Change-Id: I0af6ed7c5d51ce4ca39cb837e475942800cf6e2d
2010-03-08 17:21:35 +08:00
Raphael
eb8e5e45f8
Merge "ADT: Mark WebView as a Widget. Eclipse/ADT will display it in the GUI creator."
2010-03-06 10:45:36 -08:00
Jack Palevich
2706bde10b
Merge "Fix inverted release-EGLContext-on-pause logic."
2010-03-06 10:41:19 -08:00
Amith Yamasani
220a56fccf
Merge "Update keyboard key assets."
2010-03-05 21:40:23 -08:00
Adam Powell
6b738ebb68
Merge "Fixed a regression setting ListView selection mode without an adapter"
2010-03-05 19:57:09 -08:00
Adam Powell
43ad2726ae
Merge "Fix for badly rebased current.xml"
2010-03-05 18:54:38 -08:00
Christopher Tate
d3a50f3248
Rename cleanspec => CleanSpec to match the build rule
...
Change-Id: I9cc9027ea82a90af5f369976823f0feb0a1eeda0
2010-03-05 18:48:59 -08:00
Christopher Tate
5cbf93675a
Merge "Fix up missed refactoring in JNI reg and preloaded-classes"
2010-03-05 18:27:37 -08:00
Christopher Tate
a121ca234a
Fix up missed refactoring in JNI reg and preloaded-classes
...
Change-Id: I079bdf4edfb9083eba3e15d8e4dbf3b2bad9190c
2010-03-05 18:26:41 -08:00
Romain Guy
572e5aa70a
Merge "Correctly validate numbers when pasted in NumberPicker. Bug #2258525 "
2010-03-05 17:34:10 -08:00
Christopher Tate
137e32fc35
Merge "Fix doc references to "android.backup" to the new "android.app.backup""
2010-03-05 17:32:52 -08:00
Chih-Chung Chang
7d17d478e3
Merge "Still do dump() if we cannot get mServiceLock for a while."
2010-03-05 17:24:52 -08:00
Christopher Tate
85a5084833
Merge "Refactor android.backup => android.app.backup"
2010-03-05 16:29:04 -08:00