OSDN Git Service

android-x86/frameworks-native.git
13 years agoimplement EGL_TEXTURE_EXTERNAL_OES in libagl
Mathias Agopian [Thu, 18 Aug 2011 23:26:21 +0000 (16:26 -0700)]
implement EGL_TEXTURE_EXTERNAL_OES in libagl

this allows the emulator to display some graphics

Change-Id: Ib4671ad70b8df598d02307f2b9c5b843421cea25

13 years agodon't return the current buffer from dequeueBuffer
Mathias Agopian [Wed, 17 Aug 2011 22:42:04 +0000 (15:42 -0700)]
don't return the current buffer from dequeueBuffer

we were not reseting mCurrentTexture in some situations
which in turn caused dequeueBuffers() return a
"FREE" buffer that was also current.
Very often it was harmless, but it created a race with
updateTexImage() which could cause the following
queueBuffers() to fail.

Bug: 5156325
Change-Id: If15a31dc869117543d220d6e5562c57116cbabdb

13 years agofix a small race condition when returning the default width/height of a SurfaceTexture
Mathias Agopian [Wed, 17 Aug 2011 19:45:40 +0000 (12:45 -0700)]
fix a small race condition when returning the default width/height of a SurfaceTexture

Change-Id: I581bf609505dfb5d4ec5957b2ef2c77df6cfb15f

13 years agoMerge "as a debug option SrufaceFlinger can now connect to DDMS"
Mathias Agopian [Wed, 17 Aug 2011 16:58:33 +0000 (09:58 -0700)]
Merge "as a debug option SrufaceFlinger can now connect to DDMS"

13 years agoMerge "docs: OpenGL ES 1.0 and 2.0 Tutorials"
Joe Fernandez [Wed, 17 Aug 2011 16:31:45 +0000 (09:31 -0700)]
Merge "docs: OpenGL ES 1.0 and 2.0 Tutorials"

13 years agoMerge "New spinners Bug: 5165176"
Justin Ho [Wed, 17 Aug 2011 16:13:16 +0000 (09:13 -0700)]
Merge "New spinners Bug: 5165176"

13 years agoMerge "Remove longpress support from the software Home key."
Daniel Sandler [Wed, 17 Aug 2011 13:48:13 +0000 (06:48 -0700)]
Merge "Remove longpress support from the software Home key."

13 years agoMerge "Breathing room between RSSI and battery on tablets."
Daniel Sandler [Wed, 17 Aug 2011 13:47:11 +0000 (06:47 -0700)]
Merge "Breathing room between RSSI and battery on tablets."

13 years agoMerge "Breaks the build"
Svetoslav Ganov [Wed, 17 Aug 2011 12:27:07 +0000 (05:27 -0700)]
Merge "Breaks the build"

13 years agoMerge "Display thumbnails one by one and cache them."
Chih-Chung Chang [Wed, 17 Aug 2011 11:41:33 +0000 (04:41 -0700)]
Merge "Display thumbnails one by one and cache them."

13 years agoMerge "Adding accessibility support to the PIN lock screen."
Svetoslav Ganov [Wed, 17 Aug 2011 11:31:37 +0000 (04:31 -0700)]
Merge "Adding accessibility support to the PIN lock screen."

13 years agoMerge "Fix for bug 3429537 Google voice (web version) does not play messages on HC"
Kristian Monsen [Wed, 17 Aug 2011 09:41:39 +0000 (02:41 -0700)]
Merge "Fix for bug 3429537 Google voice (web version) does not play messages on HC"

13 years agoMerge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS...
Kristian Monsen [Wed, 17 Aug 2011 09:41:00 +0000 (02:41 -0700)]
Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"

13 years agoMerge "No need to pass an AssetManager to native when creating a WebView"
Ben Murdoch [Wed, 17 Aug 2011 09:28:52 +0000 (02:28 -0700)]
Merge "No need to pass an AssetManager to native when creating a WebView"

13 years agoam 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of service...
Dianne Hackborn [Wed, 17 Aug 2011 03:47:39 +0000 (20:47 -0700)]
am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."

* commit '51beb81a8e901020293b7a30a68b405bca71d258':
  Handle stopping of services with still bound applications.

13 years agoam ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still...
Dianne Hackborn [Wed, 17 Aug 2011 03:45:19 +0000 (20:45 -0700)]
am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."

* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
  Handle stopping of services with still bound applications.

13 years agoam 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applica...
Dianne Hackborn [Wed, 17 Aug 2011 03:42:17 +0000 (20:42 -0700)]
am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."

* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
  Handle stopping of services with still bound applications.

13 years agoam baaf3ce6: Merge "Handle stopping of services with still bound applications."
Dianne Hackborn [Wed, 17 Aug 2011 03:39:50 +0000 (20:39 -0700)]
am baaf3ce6: Merge "Handle stopping of services with still bound applications."

* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
  Handle stopping of services with still bound applications.

13 years agoMerge "Handle stopping of services with still bound applications."
Dianne Hackborn [Wed, 17 Aug 2011 02:29:25 +0000 (19:29 -0700)]
Merge "Handle stopping of services with still bound applications."

13 years agoMerge "Use camcorder profiles for MediaRecorderStressTest"
James Dong [Wed, 17 Aug 2011 01:26:54 +0000 (18:26 -0700)]
Merge "Use camcorder profiles for MediaRecorderStressTest"

13 years agoMerge "cherrypick Change-Id: I245fcc37495196b46d1930f74bdb7632fc106af2 docs: update...
Scott Main [Wed, 17 Aug 2011 01:26:34 +0000 (18:26 -0700)]
Merge "cherrypick Change-Id: I245fcc37495196b46d1930f74bdb7632fc106af2 docs: update ndk requirements issue 5157542"

13 years agoMerge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic"
Fabrice Di Meglio [Wed, 17 Aug 2011 00:35:06 +0000 (17:35 -0700)]
Merge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic"

13 years agoMerge "Don't crash if a drag recipient throws an uncaught exception"
Christopher Tate [Wed, 17 Aug 2011 00:03:24 +0000 (17:03 -0700)]
Merge "Don't crash if a drag recipient throws an uncaught exception"

13 years agoMerge "Fix bug 5048082 - Conversation doesn't scroll after you send a message"
Adam Powell [Tue, 16 Aug 2011 23:46:48 +0000 (16:46 -0700)]
Merge "Fix bug 5048082 - Conversation doesn't scroll after you send a message"

13 years agoMerge "Rename an asset and update ic_commit_* drawables."
Amith Yamasani [Tue, 16 Aug 2011 23:45:13 +0000 (16:45 -0700)]
Merge "Rename an asset and update ic_commit_* drawables."

13 years agoMerge "Move the padding to the text field in SearchView."
Amith Yamasani [Tue, 16 Aug 2011 23:19:56 +0000 (16:19 -0700)]
Merge "Move the padding to the text field in SearchView."

13 years agoMerge "Set rotation to landscape on HDMI instead of 0"
Erik Gilling [Tue, 16 Aug 2011 22:57:24 +0000 (15:57 -0700)]
Merge "Set rotation to landscape on HDMI instead of 0"

13 years agoMerge "Fix bug 5165771 - Gmail: crash on launch from notifier"
Adam Powell [Tue, 16 Aug 2011 22:24:51 +0000 (15:24 -0700)]
Merge "Fix bug 5165771 - Gmail: crash on launch from notifier"

13 years agoMerge "b/5080166 Enalbe multi-touch on external touch escreen."
Huahui Wu [Tue, 16 Aug 2011 22:09:08 +0000 (15:09 -0700)]
Merge "b/5080166 Enalbe multi-touch on external touch escreen."

13 years agoMerge "Add Lohit-Hindi.ttf as a system fallback font"
Russell Brenner [Tue, 16 Aug 2011 22:06:16 +0000 (15:06 -0700)]
Merge "Add Lohit-Hindi.ttf as a system fallback font"

13 years agoMerge "P2p enhancements"
repo sync [Tue, 16 Aug 2011 21:50:56 +0000 (14:50 -0700)]
Merge "P2p enhancements"

13 years agoMerge "Error handling in ACodec and Nuplayer."
Andreas Huber [Tue, 16 Aug 2011 21:37:51 +0000 (14:37 -0700)]
Merge "Error handling in ACodec and Nuplayer."

13 years agoMerge "Prevent NPE in HardwareRenderer Bug #5169815"
Romain Guy [Tue, 16 Aug 2011 21:30:50 +0000 (14:30 -0700)]
Merge "Prevent NPE in HardwareRenderer Bug #5169815"

13 years agoMerge "VPN: reset legacy VPN when resetting IPv4 addresses."
Chia-chi Yeh [Tue, 16 Aug 2011 21:25:30 +0000 (14:25 -0700)]
Merge "VPN: reset legacy VPN when resetting IPv4 addresses."

13 years agoMerge "add the Identity contacts mimetype Bug: 5061729"
Fred Quintana [Tue, 16 Aug 2011 21:19:59 +0000 (14:19 -0700)]
Merge "add the Identity contacts mimetype Bug: 5061729"

13 years agoMerge "UsbManager: Use resource IDs for notification IDs"
Mike Lockwood [Tue, 16 Aug 2011 21:06:59 +0000 (14:06 -0700)]
Merge "UsbManager: Use resource IDs for notification IDs"

13 years agoMerge "Add an API to set the transform on a TextureView's surface texture. Bug #5156689"
Romain Guy [Tue, 16 Aug 2011 20:56:38 +0000 (13:56 -0700)]
Merge "Add an API to set the transform on a TextureView's surface texture. Bug #5156689"

13 years agoMerge "Updated audio volume icons."
Amith Yamasani [Tue, 16 Aug 2011 20:35:50 +0000 (13:35 -0700)]
Merge "Updated audio volume icons."

13 years agoMerge "Small improvements to am command."
Dianne Hackborn [Tue, 16 Aug 2011 20:26:12 +0000 (13:26 -0700)]
Merge "Small improvements to am command."

13 years agoMerge "Change the behavior of SuggestionSpan."
Gilles Debunne [Tue, 16 Aug 2011 20:23:25 +0000 (13:23 -0700)]
Merge "Change the behavior of SuggestionSpan."

13 years agoMerge "Make the navigation bar opaque."
Daniel Sandler [Tue, 16 Aug 2011 20:11:04 +0000 (13:11 -0700)]
Merge "Make the navigation bar opaque."

13 years agoMerge "Offer a masked version of setUiOptions for windows to only modify certain...
Adam Powell [Tue, 16 Aug 2011 20:10:55 +0000 (13:10 -0700)]
Merge "Offer a masked version of setUiOptions for windows to only modify certain flags."

13 years agoMerge "dumpsys: fix problems with -a option in battery and batteryinfo services"
Mike Lockwood [Tue, 16 Aug 2011 20:07:17 +0000 (13:07 -0700)]
Merge "dumpsys: fix problems with -a option in battery and batteryinfo services"

13 years agoMerge "Properly initialize some instance variables."
Andreas Huber [Tue, 16 Aug 2011 20:06:19 +0000 (13:06 -0700)]
Merge "Properly initialize some instance variables."

13 years agoMerge "Voice search icon replaced by X on typing."
Amith Yamasani [Tue, 16 Aug 2011 19:45:08 +0000 (12:45 -0700)]
Merge "Voice search icon replaced by X on typing."

13 years agoMerge "Accessibility strings for search view components."
Amith Yamasani [Tue, 16 Aug 2011 17:40:02 +0000 (10:40 -0700)]
Merge "Accessibility strings for search view components."

13 years agoMerge "Flush central DNS cache when things change."
Robert Greenwalt [Tue, 16 Aug 2011 16:41:54 +0000 (09:41 -0700)]
Merge "Flush central DNS cache when things change."

13 years agoMerge "docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b"
Robert Ly [Tue, 16 Aug 2011 16:17:35 +0000 (09:17 -0700)]
Merge "docs: cherrypick from hc-mr2 Change-Id: I42d2befab1c848dc0b9aa5b4c5ac25ee50bd9a7b"

13 years agoMerge "Infrastructure to support package verifier"
Kenny Root [Tue, 16 Aug 2011 15:35:53 +0000 (08:35 -0700)]
Merge "Infrastructure to support package verifier"

13 years agoMerge "Throw exception on odd length Signatures"
Kenny Root [Tue, 16 Aug 2011 15:34:22 +0000 (08:34 -0700)]
Merge "Throw exception on odd length Signatures"

13 years agoMerge "Updated frameworks/base/core assets Bug: 5076695"
Justin Ho [Tue, 16 Aug 2011 14:33:43 +0000 (07:33 -0700)]
Merge "Updated frameworks/base/core assets Bug: 5076695"

13 years agoMerge "Add a function to query the available memory on the device."
Ben Murdoch [Tue, 16 Aug 2011 09:11:44 +0000 (02:11 -0700)]
Merge "Add a function to query the available memory on the device."

13 years agoas a debug option SrufaceFlinger can now connect to DDMS
Mathias Agopian [Tue, 16 Aug 2011 03:44:40 +0000 (20:44 -0700)]
as a debug option SrufaceFlinger can now connect to DDMS

this is disabled by default. To enable:
  setprop debug.sf.ddms 1

this debug option requires to restart SurfaceFlinger

Change-Id: Ic2f8050b29911b55bcd21721648b6978700c277d

13 years agoMerge "Fix build."
Dianne Hackborn [Tue, 16 Aug 2011 02:22:25 +0000 (19:22 -0700)]
Merge "Fix build."

13 years agoMerge "Fix bug 5167078 - Show a 'cheat sheet' popup for icon-only action buttons"
Adam Powell [Tue, 16 Aug 2011 02:06:54 +0000 (19:06 -0700)]
Merge "Fix bug 5167078 - Show a 'cheat sheet' popup for icon-only action buttons"

13 years agoMerge "Add new am option to profile the launching of an activity."
Dianne Hackborn [Tue, 16 Aug 2011 01:57:57 +0000 (18:57 -0700)]
Merge "Add new am option to profile the launching of an activity."

13 years agoMerge "Fix the crazy RSSI icons."
Daniel Sandler [Tue, 16 Aug 2011 01:51:04 +0000 (18:51 -0700)]
Merge "Fix the crazy RSSI icons."

13 years agoMerge "Foreground/background network stats using sets."
Jeff Sharkey [Tue, 16 Aug 2011 01:44:15 +0000 (18:44 -0700)]
Merge "Foreground/background network stats using sets."

13 years agoMerge "Add NativeDaemonConnector users to watchdog."
Jeff Sharkey [Tue, 16 Aug 2011 01:43:54 +0000 (18:43 -0700)]
Merge "Add NativeDaemonConnector users to watchdog."

13 years agoMerge "Fix bug #3388534 Long file names are improperly displayed when played"
Fabrice Di Meglio [Tue, 16 Aug 2011 01:40:34 +0000 (18:40 -0700)]
Merge "Fix bug #3388534 Long file names are improperly displayed when played"

13 years agoMerge "Find next focus id from inside-out. Bug: 5165543"
Jeff Brown [Tue, 16 Aug 2011 01:21:54 +0000 (18:21 -0700)]
Merge "Find next focus id from inside-out. Bug: 5165543"

13 years agoMerge "Adjust holo tabs to match spec."
Jeff Sharkey [Tue, 16 Aug 2011 01:17:43 +0000 (18:17 -0700)]
Merge "Adjust holo tabs to match spec."

13 years agoMerge "Fix synchronization issue in ArrayAdapter External bug #19235"
Romain Guy [Tue, 16 Aug 2011 01:15:22 +0000 (18:15 -0700)]
Merge "Fix synchronization issue in ArrayAdapter External bug #19235"

13 years agoMerge "Fix bug 5049406 - ActionBar UP with no home icon, tap highlight looks broken"
Adam Powell [Tue, 16 Aug 2011 01:09:47 +0000 (18:09 -0700)]
Merge "Fix bug 5049406 - ActionBar UP with no home icon, tap highlight looks broken"

13 years agoMerge "Change prepare bluetooth timeout from 7 seconds to 10 seconds"
Matthew Xie [Tue, 16 Aug 2011 01:01:57 +0000 (18:01 -0700)]
Merge "Change prepare bluetooth timeout from 7 seconds to 10 seconds"

13 years agoMerge "Fix issue 5131056: key beeps when screen is locked"
Eric Laurent [Tue, 16 Aug 2011 01:01:37 +0000 (18:01 -0700)]
Merge "Fix issue 5131056: key beeps when screen is locked"

13 years agoMerge "Add utility functions for pause and tonewait pause."
Jaikumar Ganesh [Tue, 16 Aug 2011 00:33:21 +0000 (17:33 -0700)]
Merge "Add utility functions for pause and tonewait pause."

13 years agoMerge "Fix stuck in pairing when BT is turned off."
Jaikumar Ganesh [Tue, 16 Aug 2011 00:33:12 +0000 (17:33 -0700)]
Merge "Fix stuck in pairing when BT is turned off."

13 years agoMerge "Bug 5045498 javadoc for the remote control client API"
Jean-Michel Trivi [Tue, 16 Aug 2011 00:14:04 +0000 (17:14 -0700)]
Merge "Bug 5045498 javadoc for the remote control client API"

13 years agoMerge "Bug 5045498 Send media button event receiver to remote control"
Jean-Michel Trivi [Tue, 16 Aug 2011 00:12:33 +0000 (17:12 -0700)]
Merge "Bug 5045498 Send media button event receiver to remote control"

13 years agoMerge "have the sensorsevice test print the delay of the first received event"
Mathias Agopian [Tue, 16 Aug 2011 00:11:49 +0000 (17:11 -0700)]
Merge "have the sensorsevice test print the delay of the first received event"

13 years agoMerge "Fix bug 5165223 Fix Holo Spinner item/dropdown alignment."
Adam Powell [Tue, 16 Aug 2011 00:05:42 +0000 (17:05 -0700)]
Merge "Fix bug 5165223 Fix Holo Spinner item/dropdown alignment."

13 years agoMerge "Deprecate use of some audio effects on output mix."
Eric Laurent [Mon, 15 Aug 2011 22:49:55 +0000 (15:49 -0700)]
Merge "Deprecate use of some audio effects on output mix."

13 years agoMerge changes I4d4580e8,I47b21293,I0767ac2a
Mathias Agopian [Mon, 15 Aug 2011 22:44:33 +0000 (15:44 -0700)]
Merge changes I4d4580e8,I47b21293,I0767ac2a

* changes:
  fix test-opengl-swapinterval
  revert last change to EGLUtils::selectConfigForPixelFormat
  boot animation doesn't use EGLUtils anymore

13 years agofix test-opengl-swapinterval
Mathias Agopian [Mon, 15 Aug 2011 21:56:38 +0000 (14:56 -0700)]
fix test-opengl-swapinterval

EGLConfig selection should now work on any device

Change-Id: I4d4580e891d1faf817fa853838406fb49d12e50a

13 years agorevert last change to EGLUtils::selectConfigForPixelFormat
Mathias Agopian [Mon, 15 Aug 2011 22:15:40 +0000 (15:15 -0700)]
revert last change to EGLUtils::selectConfigForPixelFormat

EGLUtils::selectConfigForPixelFormat is only used by
command line tests and it simply selects a config
based on the EGL_NATIVE_VISUAL_ID.

13 years agoMerge "Import revised translations."
Eric Fischer [Mon, 15 Aug 2011 20:22:31 +0000 (13:22 -0700)]
Merge "Import revised translations."

13 years agoMerge "Fix external size calculations"
Kenny Root [Mon, 15 Aug 2011 20:20:34 +0000 (13:20 -0700)]
Merge "Fix external size calculations"

13 years agoMerge "Fix blocked event handling in InputDispatcher. Bug: 5161854"
Jeff Brown [Mon, 15 Aug 2011 20:09:08 +0000 (13:09 -0700)]
Merge "Fix blocked event handling in InputDispatcher. Bug: 5161854"

13 years agoMerge "docs: fix for bug 5057581"
Robert Ly [Mon, 15 Aug 2011 19:16:41 +0000 (12:16 -0700)]
Merge "docs: fix for bug 5057581"

13 years agoMerge "Implement switchConnectable with Powered property setting instead of scan...
Matthew Xie [Mon, 15 Aug 2011 18:49:31 +0000 (11:49 -0700)]
Merge "Implement switchConnectable with Powered property setting instead of scan modes"

13 years agoMerge "Fix xml coding style (turn tabs to spaces)"
Bart Sears [Mon, 15 Aug 2011 18:43:40 +0000 (11:43 -0700)]
Merge "Fix xml coding style (turn tabs to spaces)"

13 years agoMerge "Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers to...
Daniel Lehmann [Mon, 15 Aug 2011 18:39:58 +0000 (11:39 -0700)]
Merge "Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers to avoid name collision."

13 years agoMerge "Revert "Use a weakreference to prevent the static variable from holding an...
Amith Yamasani [Mon, 15 Aug 2011 18:14:19 +0000 (11:14 -0700)]
Merge "Revert "Use a weakreference to prevent the static variable from holding an Activity." Bug was fixed in a different way."

13 years agoMerge "Add private permission for sending SMS via Messaging app"
Tom Taylor [Mon, 15 Aug 2011 17:59:30 +0000 (10:59 -0700)]
Merge "Add private permission for sending SMS via Messaging app"

13 years agoMerge "Fix bug 5159596 - Slider grabs touch point when trying to scroll a list"
Adam Powell [Mon, 15 Aug 2011 17:29:10 +0000 (10:29 -0700)]
Merge "Fix bug 5159596 - Slider grabs touch point when trying to scroll a list"

13 years agoMerge "Move date format strings to donottranslate.xml and add locale overrides."
Eric Fischer [Mon, 15 Aug 2011 17:24:49 +0000 (10:24 -0700)]
Merge "Move date format strings to donottranslate.xml and add locale overrides."

13 years agoMerge "Edit to APN read/write APN Settings permissions. Bug: 5145868"
Claudia de Veaux [Mon, 15 Aug 2011 17:24:19 +0000 (10:24 -0700)]
Merge "Edit to APN read/write APN Settings permissions. Bug: 5145868"

13 years agoMerge "Text suggestions are enabled for a subset of input types"
Gilles Debunne [Mon, 15 Aug 2011 17:07:59 +0000 (10:07 -0700)]
Merge "Text suggestions are enabled for a subset of input types"

13 years agoMerge "Change Preferences padding to match UI spec."
Jeff Sharkey [Mon, 15 Aug 2011 04:18:02 +0000 (21:18 -0700)]
Merge "Change Preferences padding to match UI spec."

13 years agoMerge "Use PARCELABLE_WIRTE_RETURN_VALUE flag in InputChannel. Bug: 5161290"
Jeff Brown [Mon, 15 Aug 2011 03:13:19 +0000 (20:13 -0700)]
Merge "Use PARCELABLE_WIRTE_RETURN_VALUE flag in InputChannel. Bug: 5161290"

13 years agoMerge "Fix bug 4981687 - WiFi connection dialog should dismiss when tapped outside."
Adam Powell [Mon, 15 Aug 2011 00:38:27 +0000 (17:38 -0700)]
Merge "Fix bug 4981687 - WiFi connection dialog should dismiss when tapped outside."

13 years agoMerge "Fix bug 5154361 - New force close dialog text breaks button order rules"
Adam Powell [Mon, 15 Aug 2011 00:23:29 +0000 (17:23 -0700)]
Merge "Fix bug 5154361 - New force close dialog text breaks button order rules"

13 years agoMerge "Fix bug 5159736 - Make DeviceDefault the default"
Adam Powell [Sun, 14 Aug 2011 23:57:45 +0000 (16:57 -0700)]
Merge "Fix bug 5159736 - Make DeviceDefault the default"

13 years agoMerge "Fail request for audio focus when linkToDeath fails"
Jean-Michel Trivi [Sun, 14 Aug 2011 23:12:09 +0000 (16:12 -0700)]
Merge "Fail request for audio focus when linkToDeath fails"

13 years agoMerge "Several API changes as requested by ES:"
Daniel Lehmann [Sun, 14 Aug 2011 23:01:59 +0000 (16:01 -0700)]
Merge "Several API changes as requested by ES:"

13 years agoMerge "MediaScanner: Clear file path before deleting records to avoid accidental...
Mike Lockwood [Sun, 14 Aug 2011 21:39:12 +0000 (14:39 -0700)]
Merge "MediaScanner: Clear file path before deleting records to avoid accidental file deletions"

13 years agoMerge "Fix leak of global references and AudioFocusDeathHandler objects."
Jean-Michel Trivi [Sun, 14 Aug 2011 21:24:09 +0000 (14:24 -0700)]
Merge "Fix leak of global references and AudioFocusDeathHandler objects."

13 years agoMerge "Fix bug 5078498 - Icons jump around on split action bar"
Adam Powell [Sat, 13 Aug 2011 06:36:20 +0000 (23:36 -0700)]
Merge "Fix bug 5078498 - Icons jump around on split action bar"

13 years agoMerge "Update sim_removed_message string."
Wink Saville [Sat, 13 Aug 2011 06:22:08 +0000 (23:22 -0700)]
Merge "Update sim_removed_message string."