Fred Quintana
e8bc3ee3a1
Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 11:56:16 -07:00
Dianne Hackborn
818d04abb4
Merge "Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE" into froyo
2010-04-26 18:51:31 -07:00
Jean-Michel Trivi
91e964265e
Merge "Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. The fix consists in quitting the Looper used for the previous sound when a new sound is started." into froyo
2010-04-26 18:02:35 -07:00
The Android Automerger
0042a8ceb1
Merge branch 'froyo' into froyo-release
2010-04-26 11:44:50 -07:00
Robert Greenwalt
5b1336d1a3
Merge "Handle throttling being disabled via policy change" into froyo
2010-04-26 11:13:11 -07:00
Bjorn Bringert
89a7523222
Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
2010-04-26 07:52:58 -07:00
Grace Kloba
f0d64eb1af
Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#change,49444 I think it is safer to be conservative." into froyo
2010-04-23 16:19:22 -07:00
Grace Kloba
1bffbf24e0
Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683 . In GB, we need to revisit this issue." into froyo
2010-04-23 15:27:58 -07:00
Dianne Hackborn
8610b8090f
Merge "Fix typo when parsing external platform version from Settings." into froyo
2010-04-23 15:19:34 -07:00
Jean-Michel Trivi
6f675cfb63
Merge "Fix bug 2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
2010-04-23 14:48:10 -07:00
Dianne Hackborn
ddf83ba28c
Merge "Fix issue #2621809 : Kill! Kill! Kill!" into froyo
2010-04-23 14:23:39 -07:00
Neal Nguyen
bc33726ea9
Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
2010-04-23 14:21:53 -07:00
Robert Greenwalt
2e909fffdc
Merge "Respond to changes in throttle policy." into froyo
2010-04-23 13:50:03 -07:00
Dianne Hackborn
db62452136
Merge "Some debugging help for issue #2594388 " into froyo
2010-04-23 12:59:47 -07:00
The Android Automerger
66fa1a6fe5
Merge branch 'froyo' into froyo-release
2010-04-23 11:54:58 -07:00
Robert Greenwalt
41e202245b
Merge "Add a Throttle check shortly after boot." into froyo
2010-04-23 10:17:14 -07:00
Wei Huang
411b51f1f1
Merge "bug #2618035 : applying Moto's patch to fix a email/shortcode parsing bug." into froyo
2010-04-22 16:33:40 -07:00
Dianne Hackborn
c4384ad5c7
Merge "Fix issue #2619247 : Music sometimes stops playing when navigation talks" into froyo
2010-04-22 16:23:44 -07:00
Dianne Hackborn
f78357eb2b
Merge "Fix issue #2608292 : Fails to launch the video camera preview" into froyo
2010-04-22 16:20:19 -07:00
The Android Automerger
57755fa12e
Merge branch 'froyo' into froyo-release
2010-04-22 16:16:39 -07:00
Suchi Amalapurapu
5014549476
Merge "Fix error code when media is filled up." into froyo
2010-04-22 15:52:25 -07:00
Grace Kloba
6df8f3f5f6
Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo
2010-04-22 13:01:55 -07:00
Christopher Tate
b54bb38429
Merge "SDK: new 'bmgr' docs in the Dev Guide" into froyo
2010-04-22 12:51:22 -07:00
Robert Greenwalt
cb67e80453
Merge "Trim throttle logs." into froyo
2010-04-22 09:08:25 -07:00
Grace Kloba
7de6c06c16
Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
2010-04-22 08:20:23 -07:00
Christopher Tate
2b2ae9f99b
Merge "Fix security hole in Google backup transport registration" into froyo
2010-04-21 18:10:20 -07:00
John Wang
f9dc03312a
Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
2010-04-21 14:43:12 -07:00
The Android Automerger
9a1ae89f87
Merge branch 'froyo' into froyo-release
2010-04-21 10:46:43 -07:00
Mathias Agopian
11777e9a6e
DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
...
don't use glDrawTexi() anymore
Change-Id: If71334de39114b0edce7771366f8d8dc26f6911e
2010-04-20 21:55:40 -07:00
Jeff Brown
27316b62fe
Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
2010-04-20 17:53:00 -07:00
Robert Greenwalt
4dd043a420
Merge "Move Tethering off the ServerThread." into froyo
2010-04-20 17:37:22 -07:00
Andreas Huber
09cf6538ea
Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
2010-04-20 16:29:23 -07:00
Jean-Michel Trivi
d1f799f11c
Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot request audio focus (request is denied). Because the phone state is now mostly handled like a new client, there is no need monitor mode changes and to keep track of undispatched focus changes, as those will delayed focus gains will now automatically happen at the end of the call when the phone client is removed from the focus stack." into froyo
2010-04-20 15:57:30 -07:00
Suchi Amalapurapu
b39bdc37ba
Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
2010-04-20 15:04:41 -07:00
Andreas Huber
7b783a8be7
Merge "Don't coalesce more than 250ms worth of encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo
2010-04-20 14:48:45 -07:00
Jean-Michel Trivi
ab1f727968
Merge "Fix bug 2604132 40s skip after undocking In case of A2DP write errors, there is an overflow in the calculation of the sleep duration to simulate the timing of a successful write." into froyo
2010-04-20 14:41:11 -07:00
Nicolas Roard
0ff7210220
Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
2010-04-20 13:22:44 -07:00
Daniel Sandler
3438793a56
Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
2010-04-20 12:57:54 -07:00
Jean-Michel Trivi
e783275aca
Fix bug 2604132 40s skip after undocking
...
In case of A2DP write errors, there is an overflow in the calculation
of the sleep duration to simulate the timing of a successful write.
Change-Id: Ic4e570aebf07fac69735aab1bbc2fc73512ee795
2010-04-20 12:12:13 -07:00
Carl Shapiro
4dd73c65e4
Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
2010-04-20 11:42:39 -07:00
Grace Kloba
f1f24f304b
Merge "Don't inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo
2010-04-20 11:40:07 -07:00
Marco Nelissen
dbd5ad43e8
Merge "When updating existing entries in the media database, don't update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo
2010-04-20 11:24:10 -07:00
Mathias Agopian
8288f66f0a
Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
2010-04-19 19:23:45 -07:00
Mathias Agopian
3c772b706d
fix [2599939] "cannot play video" after open/close a video player a dozen of times
...
get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality),
this feature should not be used anymore.
the software renderer was incorrectly using the default ctor which set MAP_ONCE,
causing the leak. the software renderer itself is incorrectly used while coming
back from sleep.
Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
2010-04-19 19:09:03 -07:00
Jack Palevich
93bd90f80f
Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
2010-04-19 19:06:35 -07:00
Grace Kloba
b227d97442
Merge "Update the comment which supposed to be checked in in the last CL." into froyo
2010-04-19 16:11:21 -07:00
Adam Powell
6138d6b2da
Merge "Fix bug 2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
2010-04-19 15:33:08 -07:00
Robert Greenwalt
464692bdcf
Merge "Misc fixes for throttling." into froyo
2010-04-19 13:21:01 -07:00
Grace Kloba
2882ec3b0c
Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
2010-04-19 13:14:21 -07:00
The Android Automerger
27dae85aea
Merge branch 'froyo' into froyo-release
2010-04-19 12:50:25 -07:00