OSDN Git Service

android-x86/frameworks-native.git
12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 22 Nov 2011 19:56:20 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Improving PictureListener deprecating comments" into ics-mr1
Kristian Monsen [Sun, 20 Nov 2011 15:26:59 +0000 (07:26 -0800)]
Merge "Improving PictureListener deprecating comments" into ics-mr1

12 years agoMerge "Dreams (now Screen Candy) development." into ics-mr1
Daniel Sandler [Sun, 20 Nov 2011 04:42:19 +0000 (20:42 -0800)]
Merge "Dreams (now Screen Candy) development." into ics-mr1

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 23:49:39 +0000 (15:49 -0800)]
Reconcile with ics-mr0-release

Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 18 Nov 2011 23:37:45 +0000 (15:37 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam d4b22ab4: status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am d4b22ab4: status_t != bool

* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
  status_t != bool

12 years agoMerge "Text selection AccessibilityEvents are missing text." into ics-mr1
Svetoslav Ganov [Fri, 18 Nov 2011 22:39:05 +0000 (14:39 -0800)]
Merge "Text selection AccessibilityEvents are missing text." into ics-mr1

12 years agoMerge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
Wei Huang [Fri, 18 Nov 2011 22:00:09 +0000 (14:00 -0800)]
Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 21:12:32 +0000 (13:12 -0800)]
Reconcile with ics-mr0-release

Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a

12 years agoMerge "attempt to fix bug 5313580" into ics-mr1
Mathias Agopian [Fri, 18 Nov 2011 20:11:15 +0000 (12:11 -0800)]
Merge "attempt to fix bug 5313580" into ics-mr1

12 years agoMerge "Content and viewport rects set in one step." into ics-mr1
Bart Sears [Fri, 18 Nov 2011 19:46:26 +0000 (11:46 -0800)]
Merge "Content and viewport rects set in one step." into ics-mr1

12 years agoMerge "Add the support libraries to the platform documentation (build)." into ics-mr1
Svetoslav Ganov [Fri, 18 Nov 2011 18:11:35 +0000 (10:11 -0800)]
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1

12 years agoam 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
Joe Fernandez [Fri, 18 Nov 2011 14:14:01 +0000 (06:14 -0800)]
am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0

* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
  docs: Camera Features for developers

12 years agoam 48eaa6c9: docs: update caption for action bar figure to match new screenshot
Scott Main [Fri, 18 Nov 2011 10:49:49 +0000 (02:49 -0800)]
am 48eaa6c9: docs: update caption for action bar figure to match new screenshot

* commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
  docs: update caption for action bar figure to match new screenshot

12 years agoMerge "Tie screen saver to the screen off timeout." into ics-mr1
Daniel Sandler [Fri, 18 Nov 2011 05:02:40 +0000 (21:02 -0800)]
Merge "Tie screen saver to the screen off timeout." into ics-mr1

12 years agoMerge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)...
Adam Powell [Fri, 18 Nov 2011 03:44:14 +0000 (19:44 -0800)]
Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1

12 years agoMerge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into...
Jim Miller [Fri, 18 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1

12 years agoattempt to fix bug 5313580
Mathias Agopian [Fri, 18 Nov 2011 02:46:09 +0000 (18:46 -0800)]
attempt to fix bug 5313580

the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.

To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.

Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9

12 years agoMerge "add a self instrumentation into framework perf app" into ics-mr1
Guang Zhu [Fri, 18 Nov 2011 02:04:23 +0000 (18:04 -0800)]
Merge "add a self instrumentation into framework perf app" into ics-mr1

12 years agoMerge "Hide/show ime switch icon properly" into ics-mr1
satok [Fri, 18 Nov 2011 02:02:09 +0000 (18:02 -0800)]
Merge "Hide/show ime switch icon properly" into ics-mr1

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 18 Nov 2011 01:49:17 +0000 (17:49 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoMerge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
Jim Miller [Fri, 18 Nov 2011 01:41:50 +0000 (17:41 -0800)]
Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1

12 years agoMerge "docs: Camera Features for developers" into ics-mr0
Joe Fernandez [Fri, 18 Nov 2011 01:34:33 +0000 (17:34 -0800)]
Merge "docs: Camera Features for developers" into ics-mr0

12 years agoMerge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
Jamie Gennis [Fri, 18 Nov 2011 01:10:47 +0000 (17:10 -0800)]
Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1

12 years agoMerge "EGL: fix blob cache extension detection" into ics-mr1
Jamie Gennis [Fri, 18 Nov 2011 01:10:32 +0000 (17:10 -0800)]
Merge "EGL: fix blob cache extension detection" into ics-mr1

12 years agoMerge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into...
David Brown [Fri, 18 Nov 2011 00:31:10 +0000 (16:31 -0800)]
Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1

12 years agoSurfaceTexture: fix a bug with buffer reallocation
Jamie Gennis [Fri, 18 Nov 2011 00:00:44 +0000 (16:00 -0800)]
SurfaceTexture: fix a bug with buffer reallocation

This change fixes an issue involving buffer reallocation and the
ALLOW_DEQUEUE_CURRENT_BUFFER mode in SurfaceTexture.  The bug happened
when the buffer slot currently attached to the GL texture was selected
for dequeuing, but the dequeue operation caused the buffer to be
reallocated.  Because the buffer is new, the image producer could fill
the buffer and queue it before an updateTexImage call, which would
result in the "slot %d is current" error in queueBuffer.

Bug: 5631630
Change-Id: Icdd8bc5cad3c7db43953446d9be2603aaea11a8d

12 years agoMerge "GLES: add image external enums" into ics-mr1
Jamie Gennis [Thu, 17 Nov 2011 23:47:28 +0000 (15:47 -0800)]
Merge "GLES: add image external enums" into ics-mr1

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Thu, 17 Nov 2011 23:36:52 +0000 (15:36 -0800)]
Reconcile with ics-mr0-release

Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8

12 years agoam 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for...
Scott Main [Thu, 17 Nov 2011 22:49:36 +0000 (14:49 -0800)]
am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio

* commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917

12 years agoam 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug...
Bill Gruber [Thu, 17 Nov 2011 22:49:33 +0000 (14:49 -0800)]
am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0

* commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41':
  Licensing docs: clarifies server response for draft apps Bug 2900690

12 years agoam ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286...
Bill Gruber [Thu, 17 Nov 2011 22:49:32 +0000 (14:49 -0800)]
am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0

* commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de':
  Filters docs: removes references to forward-locking Bug 3055286

12 years agoam 7d4c4721: docs: add sums/sizes for adt 15.0.1
Scott Main [Thu, 17 Nov 2011 22:49:28 +0000 (14:49 -0800)]
am 7d4c4721: docs: add sums/sizes for adt 15.0.1

* commit '7d4c4721c6dd5473464d4620749b302a413c7ebd':
  docs: add sums/sizes for adt 15.0.1

12 years agoam 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1...
Fred Chung [Thu, 17 Nov 2011 22:49:26 +0000 (14:49 -0800)]
am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

* commit '4750cbd9311b763265f8ab6ddee187e0c9a71665':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e

12 years agoam 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0
Robert Ly [Thu, 17 Nov 2011 22:49:21 +0000 (14:49 -0800)]
am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0

* commit '4f361741185d523b5469a264521eeeb4eee9344d':
  docs: adt 15.0.1 rel notes

12 years agoMerge "Add a few GC-flexing microbenchmark tests" into ics-mr1
Christopher Tate [Thu, 17 Nov 2011 22:43:17 +0000 (14:43 -0800)]
Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1

12 years agoEGL: fix blob cache extension detection
Jamie Gennis [Thu, 17 Nov 2011 05:45:30 +0000 (21:45 -0800)]
EGL: fix blob cache extension detection

Bug: 5474671
Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18

12 years agoMerge "Re-enable vril-dump for adb bugreport." into ics-mr1
Jake Hamby [Thu, 17 Nov 2011 21:53:17 +0000 (13:53 -0800)]
Merge "Re-enable vril-dump for adb bugreport." into ics-mr1

12 years agoam 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0
Matthew Xie [Thu, 17 Nov 2011 21:10:14 +0000 (13:10 -0800)]
am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0

* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call

12 years agoMerge "Fix NPE on devices that don't have NFC." into ics-mr1
Nick Pelly [Thu, 17 Nov 2011 20:48:48 +0000 (12:48 -0800)]
Merge "Fix NPE on devices that don't have NFC." into ics-mr1

12 years agoMerge "SIP addresses containing "911" shouldn't be considered emergency calls" into...
David Brown [Thu, 17 Nov 2011 20:33:00 +0000 (12:33 -0800)]
Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1

12 years agoMerge "docs: Big update to action bar guide for ICS. Added section for action provide...
Scott Main [Thu, 17 Nov 2011 20:32:11 +0000 (12:32 -0800)]
Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0

12 years agoMerge "Unhide social stream permissions." into ics-mr1
Dave Santoro [Thu, 17 Nov 2011 20:26:17 +0000 (12:26 -0800)]
Merge "Unhide social stream permissions." into ics-mr1

12 years agoMerge "Draw input field focus ring in WebTextView" into ics-mr1
Michael Kolb [Thu, 17 Nov 2011 20:22:58 +0000 (12:22 -0800)]
Merge "Draw input field focus ring in WebTextView" into ics-mr1

12 years agoMerge "Only write network stats when already loaded." into ics-mr1
Jeff Sharkey [Thu, 17 Nov 2011 20:10:02 +0000 (12:10 -0800)]
Merge "Only write network stats when already loaded." into ics-mr1

12 years agoMerge "Licensing docs: clarifies server response for draft apps Bug 2900690" into...
Bill Gruber [Thu, 17 Nov 2011 19:35:16 +0000 (11:35 -0800)]
Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0

12 years agoMerge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0
Bill Gruber [Thu, 17 Nov 2011 19:34:46 +0000 (11:34 -0800)]
Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0

12 years agoMerge "Don't upgrade some settings from GB to ICS." into ics-mr1
Amith Yamasani [Thu, 17 Nov 2011 18:01:00 +0000 (10:01 -0800)]
Merge "Don't upgrade some settings from GB to ICS." into ics-mr1

12 years agoMerge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb...
Fred Chung [Thu, 17 Nov 2011 17:38:10 +0000 (09:38 -0800)]
Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0

12 years agoMerge "Adding missed Android.mk file to the original Bluetooth HDP sample Change...
Fred Chung [Thu, 17 Nov 2011 17:37:15 +0000 (09:37 -0800)]
Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1

12 years agoMerge "Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Andreas Huber [Thu, 17 Nov 2011 17:05:17 +0000 (09:05 -0800)]
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

12 years agoMerge "Fix add single character check" into ics-mr1
John Reck [Thu, 17 Nov 2011 16:48:04 +0000 (08:48 -0800)]
Merge "Fix add single character check" into ics-mr1

12 years agoMerge "Undeprecate LayoutAlgorithm" into ics-mr1
John Reck [Thu, 17 Nov 2011 16:47:29 +0000 (08:47 -0800)]
Merge "Undeprecate LayoutAlgorithm" into ics-mr1

12 years agoMerge "docs: adt 15.0.1 rel notes" into ics-mr0
Robert Ly [Thu, 17 Nov 2011 15:17:04 +0000 (07:17 -0800)]
Merge "docs: adt 15.0.1 rel notes" into ics-mr0

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:46:36 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 17 Nov 2011 14:28:25 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoMerge changes I59323dc5,I31a01aa3 into ics-mr1
Ben Murdoch [Thu, 17 Nov 2011 10:13:19 +0000 (02:13 -0800)]
Merge changes I59323dc5,I31a01aa3 into ics-mr1

* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.

12 years agoMerge "Update NTP outside locks, log large trim events." into ics-mr1
Jeff Sharkey [Thu, 17 Nov 2011 06:59:13 +0000 (22:59 -0800)]
Merge "Update NTP outside locks, log large trim events." into ics-mr1

12 years agoMerge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 06:33:55 +0000 (22:33 -0800)]
Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1

12 years agoMerge "Disable desk dock apps." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 06:33:44 +0000 (22:33 -0800)]
Merge "Disable desk dock apps." into ics-mr1

12 years agoMerge "be a bit more defensive when parsing extension strings" into ics-mr1
Mathias Agopian [Thu, 17 Nov 2011 04:59:30 +0000 (20:59 -0800)]
Merge "be a bit more defensive when parsing extension strings" into ics-mr1

12 years agoMerge "Hack to workaround the fact that the EGL context can be removed from under...
Nicolas Roard [Thu, 17 Nov 2011 03:40:04 +0000 (19:40 -0800)]
Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1

12 years agoMerge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
Matthew Xie [Thu, 17 Nov 2011 02:20:50 +0000 (18:20 -0800)]
Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1

12 years agoMerge "remove hack that hardcoded the refresh rate" into ics-mr1
Mathias Agopian [Thu, 17 Nov 2011 02:19:33 +0000 (18:19 -0800)]
Merge "remove hack that hardcoded the refresh rate" into ics-mr1

12 years agoMerge "Revert change to setInitialScale() to take display density into account."...
Mangesh Ghiware [Thu, 17 Nov 2011 02:01:35 +0000 (18:01 -0800)]
Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1

12 years agoMerge "Clean up the spell checker framework" into ics-mr1
satok [Thu, 17 Nov 2011 01:35:54 +0000 (17:35 -0800)]
Merge "Clean up the spell checker framework" into ics-mr1

12 years agoMerge "Add a default Dreams component." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 01:13:35 +0000 (17:13 -0800)]
Merge "Add a default Dreams component." into ics-mr1

12 years agoMerge "Remove day of week from phone notification panel." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 01:13:16 +0000 (17:13 -0800)]
Merge "Remove day of week from phone notification panel." into ics-mr1

12 years agobe a bit more defensive when parsing extension strings
Mathias Agopian [Thu, 17 Nov 2011 00:49:25 +0000 (16:49 -0800)]
be a bit more defensive when parsing extension strings

hopefully this will fix a crash in the emulator.

Bug: 5624674
Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b

12 years agoRevert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Mathias Agopian [Wed, 16 Nov 2011 23:59:13 +0000 (15:59 -0800)]
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"

This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450

12 years agoMerge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
Mathias Agopian [Thu, 17 Nov 2011 00:13:38 +0000 (16:13 -0800)]
Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1

12 years agoRevert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
Mathias Agopian [Wed, 16 Nov 2011 23:59:13 +0000 (15:59 -0800)]
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"

This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450

12 years agoMerge "Check the bluetooth state for getUuid call" into ics-mr0
Matthew Xie [Wed, 16 Nov 2011 23:31:03 +0000 (15:31 -0800)]
Merge "Check the bluetooth state for getUuid call" into ics-mr0

12 years agoMerge "Change MediaController look b/5584613" into ics-mr1
Marco Nelissen [Wed, 16 Nov 2011 22:54:20 +0000 (14:54 -0800)]
Merge "Change MediaController look b/5584613" into ics-mr1

12 years agoMerge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into...
Dianne Hackborn [Wed, 16 Nov 2011 22:03:09 +0000 (14:03 -0800)]
Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1

12 years agoMerge "Fix TelephonyManager to grab the best context" into ics-mr1
Robert Greenwalt [Wed, 16 Nov 2011 20:06:53 +0000 (12:06 -0800)]
Merge "Fix TelephonyManager to grab the best context" into ics-mr1

12 years agoMerge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue...
Jamie Gennis [Wed, 16 Nov 2011 19:34:30 +0000 (11:34 -0800)]
Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 18:57:45 +0000 (10:57 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoMerge "IME action (done, next...) correctly handled" into ics-mr1
Gilles Debunne [Wed, 16 Nov 2011 18:31:40 +0000 (10:31 -0800)]
Merge "IME action (done, next...) correctly handled" into ics-mr1

12 years agoMerge "Followup to a bug fix. Addtion of synchronized to the methods triggers an...
Alex Sakhartchouk [Wed, 16 Nov 2011 17:40:11 +0000 (09:40 -0800)]
Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1

12 years agoMerge "Bluetooth HDP sample." into ics-mr1
Fred Chung [Wed, 16 Nov 2011 17:31:54 +0000 (09:31 -0800)]
Merge "Bluetooth HDP sample." into ics-mr1

12 years agoNo-op merge from ics-mr0
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0

Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6

12 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release

Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e

12 years agoReconcile with ics-mr0-release ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 15:33:58 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:46:22 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoremove hack that hardcoded the refresh rate
Mathias Agopian [Wed, 16 Nov 2011 08:08:08 +0000 (00:08 -0800)]
remove hack that hardcoded the refresh rate

Change-Id: Ibdd40b337c547e80ef8541856015f1380c8d58ed

12 years agoam 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables...
Jake Hamby [Wed, 16 Nov 2011 04:16:12 +0000 (20:16 -0800)]
am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0

* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
  Fix 3GPP SMS send failure for 7-bit national language tables.

12 years agoam c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
Bill Gruber [Wed, 16 Nov 2011 04:16:02 +0000 (20:16 -0800)]
am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0

* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
  IAB Doc Fix: Error in code snippet Bug 5221766

12 years agoam 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into...
Adrian Ludwig [Wed, 16 Nov 2011 04:15:57 +0000 (20:15 -0800)]
am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0

* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
  Adding new "Security Best Practices" to the html docs.

12 years agoMerge "Document that release() should be called with onPause() and onStop() for media...
James Dong [Wed, 16 Nov 2011 04:13:03 +0000 (20:13 -0800)]
Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1

12 years agoMerge "Fix bug 5623642 - Status bar background incompatible with some legacy apps...
Adam Powell [Wed, 16 Nov 2011 03:51:56 +0000 (19:51 -0800)]
Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1

12 years agoMerge "Eliminate hw.keyboards system properties." into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 03:17:09 +0000 (19:17 -0800)]
Merge "Eliminate hw.keyboards system properties." into ics-mr1

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 16 Nov 2011 03:08:44 +0000 (19:08 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoMerge "Whoops, need to acquire lock." into ics-mr1
Dianne Hackborn [Wed, 16 Nov 2011 03:04:11 +0000 (19:04 -0800)]
Merge "Whoops, need to acquire lock." into ics-mr1

12 years agoMerge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1
Jean-Michel Trivi [Wed, 16 Nov 2011 02:19:34 +0000 (18:19 -0800)]
Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1

12 years agoMerge "rework a bit how we manage EGL extensions" into ics-mr1
Mathias Agopian [Wed, 16 Nov 2011 02:12:00 +0000 (18:12 -0800)]
Merge "rework a bit how we manage EGL extensions" into ics-mr1

12 years agoEliminate hw.keyboards system properties.
Jeff Brown [Wed, 16 Nov 2011 01:48:10 +0000 (17:48 -0800)]
Eliminate hw.keyboards system properties.

Stop using system properties to publish information about
the key character map path.  Instead, we can retrieve it
on demand by asking the window manager.

It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.

Bug: 5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669

12 years agofix crash when validating an invalid EGL objects
Mathias Agopian [Mon, 14 Nov 2011 04:50:07 +0000 (20:50 -0800)]
fix crash when validating an invalid EGL objects

the code that validated EGL objects dereferenced the object
to access its EGLDisplay -- needed for validation (!).
This was wrong for two reasons, first we dereferenced the object
before validating it (potentially leading to a crash), secondly
we didn't validate that the object existed in the right EGLDisplay.

We now use the EGLDisplay passed by the user API.

Change-Id: I66f9e851d4f8507892a6b1fee3065f124c4e7138

12 years agoMerge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1
Jim Miller [Tue, 15 Nov 2011 23:42:20 +0000 (15:42 -0800)]
Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1

12 years agoam d5897dc7: fix for build breakage.
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:00:26 +0000 (15:00 -0800)]
am d5897dc7: fix for build breakage.

* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
  fix for build breakage.