OSDN Git Service
Wu-cheng Li [Tue, 15 Nov 2011 14:14:11 +0000 (06:14 -0800)]
Merge "Improve camera face detection javadoc." into ics-mr1
Michael Jurka [Tue, 15 Nov 2011 07:53:34 +0000 (23:53 -0800)]
Merge "Updating recent apps visuals on tablet" into ics-mr1
Jeff Sharkey [Tue, 15 Nov 2011 07:37:17 +0000 (23:37 -0800)]
Merge "Conservatively trim data usage stats." into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 04:14:11 +0000 (20:14 -0800)]
Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
Adam Powell [Tue, 15 Nov 2011 03:47:55 +0000 (19:47 -0800)]
Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 03:39:09 +0000 (19:39 -0800)]
Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:36:50 +0000 (18:36 -0800)]
Merge "Improve low memory reporting." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 02:35:57 +0000 (18:35 -0800)]
Merge "Fix races when content providers are acquired and released." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:35:46 +0000 (18:35 -0800)]
Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
Daisuke Miyakawa [Tue, 15 Nov 2011 01:54:17 +0000 (17:54 -0800)]
Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
Jamie Gennis [Tue, 15 Nov 2011 01:36:46 +0000 (17:36 -0800)]
Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
Jim Miller [Tue, 15 Nov 2011 00:14:07 +0000 (16:14 -0800)]
Merge "Fix
5579440: Add transport control view to tablet unlock screens" into ics-mr1
Tsu Chiang Chuang [Mon, 14 Nov 2011 22:35:42 +0000 (14:35 -0800)]
Merge "Adding mobile microbenchmark tests." into ics-mr1
Adam Cohen [Mon, 14 Nov 2011 22:33:06 +0000 (14:33 -0800)]
Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)" into ics-mr1
Jean-Michel Trivi [Mon, 14 Nov 2011 20:31:10 +0000 (12:31 -0800)]
Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
Dave Burke [Mon, 14 Nov 2011 20:25:53 +0000 (12:25 -0800)]
Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
John Wang [Mon, 14 Nov 2011 20:10:16 +0000 (12:10 -0800)]
Merge "[maguro] Fix STK issues" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 19:49:42 +0000 (11:49 -0800)]
Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
Alex Sakhartchouk [Mon, 14 Nov 2011 18:35:08 +0000 (10:35 -0800)]
Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 08:52:09 +0000 (00:52 -0800)]
Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
Scott Main [Sat, 12 Nov 2011 03:22:07 +0000 (19:22 -0800)]
am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
Docs: update state list drawable with state_activated and revise selected/focused
Jeff Brown [Sat, 12 Nov 2011 03:22:04 +0000 (19:22 -0800)]
am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 03:22:02 +0000 (19:22 -0800)]
am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
6200a4b7eb07507055af93ec1a054640a39b9751':
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Robert Ly [Sat, 12 Nov 2011 03:22:01 +0000 (19:22 -0800)]
Robert Ly [Sat, 12 Nov 2011 03:17:23 +0000 (19:17 -0800)]
am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
Mathias Agopian [Thu, 10 Nov 2011 22:34:26 +0000 (14:34 -0800)]
Define, document, and test the behavior of very large SurfaceTextures
updateTexImage() now throws a runtime exception when its native
counterpart fails
Bug:
5506633
Change-Id: I151a6f685d465966e7df4df624412ab2da62e95f
Scott Main [Sat, 12 Nov 2011 01:17:23 +0000 (17:17 -0800)]
Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
Christopher Tate [Sat, 12 Nov 2011 00:19:29 +0000 (16:19 -0800)]
Merge "XML parsing optimizations" into ics-mr1
Adam Powell [Fri, 11 Nov 2011 22:54:02 +0000 (14:54 -0800)]
Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances." into ics-mr0
Robert Greenwalt [Fri, 11 Nov 2011 22:37:18 +0000 (14:37 -0800)]
Merge "Tone down Tethering logs." into ics-mr1
Dianne Hackborn [Fri, 11 Nov 2011 22:24:58 +0000 (14:24 -0800)]
Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
Christopher Tate [Fri, 11 Nov 2011 22:24:53 +0000 (14:24 -0800)]
Merge "Localized optimizations in views and bitmaps" into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 23:35:34 +0000 (15:35 -0800)]
EGL: add the ANDROID suffix to the blob cache ext
This change adds the ANDROID suffix to the all the types and functions
defined by the EGL_ANDROID_blob_cache extension.
Change-Id: I087875b96d9a7053efb9c8d5614f9f765eed799d
Nick Pelly [Fri, 11 Nov 2011 21:06:44 +0000 (13:06 -0800)]
Merge "Changes for access control." into ics-mr1
Matthew Xie [Fri, 11 Nov 2011 20:16:41 +0000 (12:16 -0800)]
Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
Robert Ly [Fri, 11 Nov 2011 20:06:39 +0000 (12:06 -0800)]
Merge "docs: ndk r7 rel notes" into ics-mr0
Peter Ng [Fri, 11 Nov 2011 19:57:41 +0000 (11:57 -0800)]
Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
Dianne Hackborn [Fri, 11 Nov 2011 19:36:14 +0000 (11:36 -0800)]
Merge "Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
James Dong [Fri, 11 Nov 2011 18:49:24 +0000 (10:49 -0800)]
Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 18:46:02 +0000 (10:46 -0800)]
Merge "Didn't mean to check this in..." into ics-mr1
Eric Laurent [Fri, 11 Nov 2011 16:17:22 +0000 (08:17 -0800)]
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:25 +0000 (07:39 -0800)]
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:18 +0000 (07:39 -0800)]
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:11 +0000 (07:39 -0800)]
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
James Dong [Fri, 11 Nov 2011 09:44:06 +0000 (01:44 -0800)]
Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
Svetoslav Ganov [Fri, 11 Nov 2011 08:02:27 +0000 (08:02 +0000)]
am
7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
* commit '
7b8bec280f20e8a5863d8214bbc195497335eba6':
PopupWindow dismiss() can get into a recursive loop.
Chet Haase [Fri, 11 Nov 2011 08:02:27 +0000 (08:02 +0000)]
am
30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
* commit '
30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
DO NOT MERGE. Fix leak in LayoutTransition
Jamie Gennis [Fri, 11 Nov 2011 08:02:26 +0000 (08:02 +0000)]
am
ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
* commit '
ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
Svetoslav Ganov [Fri, 11 Nov 2011 08:00:02 +0000 (00:00 -0800)]
Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
Jeff Sharkey [Fri, 11 Nov 2011 04:31:03 +0000 (20:31 -0800)]
Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
Daniel Sandler [Fri, 11 Nov 2011 04:16:47 +0000 (20:16 -0800)]
Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
Daniel Sandler [Fri, 11 Nov 2011 04:16:38 +0000 (20:16 -0800)]
Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
Adam Powell [Fri, 11 Nov 2011 03:56:03 +0000 (19:56 -0800)]
Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1
Adam Cohen [Fri, 11 Nov 2011 03:27:58 +0000 (19:27 -0800)]
Merge "Deferring wallpaper update to improve workspace scrolling (issue
5506959)" into ics-mr1
John Reck [Fri, 11 Nov 2011 01:58:27 +0000 (17:58 -0800)]
Merge "Fix lastVisible/global rects" into ics-mr1
Martijn Coenen [Fri, 11 Nov 2011 01:40:20 +0000 (17:40 -0800)]
Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
Chet Haase [Fri, 11 Nov 2011 01:33:31 +0000 (17:33 -0800)]
Merge "Fix leak in LayoutTransition" into ics-mr1
Robert Greenwalt [Fri, 11 Nov 2011 01:22:14 +0000 (17:22 -0800)]
Merge "Fix Wimax-less build." into ics-mr1
Romain Guy [Fri, 11 Nov 2011 01:10:41 +0000 (17:10 -0800)]
Merge "Terminate EGL when an app goes in the background" into ics-mr1
Romain Guy [Thu, 10 Nov 2011 04:10:18 +0000 (20:10 -0800)]
Terminate EGL when an app goes in the background
This does not happen on high end gfx devices. This happens
only if only one EGL context is initialized in the current
process.
Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
Mathias Agopian [Fri, 11 Nov 2011 00:38:42 +0000 (16:38 -0800)]
Merge "boot animation is dithered and scaled" into ics-mr1
Jamie Gennis [Fri, 11 Nov 2011 00:06:12 +0000 (16:06 -0800)]
Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
Romain Guy [Thu, 10 Nov 2011 23:02:07 +0000 (15:02 -0800)]
Merge "Initialize egl_cache with an app writeable file" into ics-mr1
Jeff Brown [Thu, 10 Nov 2011 22:40:48 +0000 (14:40 -0800)]
Merge "Wake on volume key when in dock. Bug:
5580373" into ics-mr1
Peter Ng [Thu, 10 Nov 2011 22:31:09 +0000 (14:31 -0800)]
Merge "lock pattern width spec set to max" into ics-mr1
Peter Ng [Thu, 10 Nov 2011 22:26:57 +0000 (14:26 -0800)]
Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
Katie McCormick [Thu, 10 Nov 2011 22:20:37 +0000 (22:20 +0000)]
am
921afe39: Doc change: new Calendar content provider doc
* commit '
921afe39d6041b06c6a002b08f9dcd1561a9ae99':
Doc change: new Calendar content provider doc
Adam Powell [Thu, 10 Nov 2011 22:16:45 +0000 (14:16 -0800)]
Merge "Fix access modifiers on ImageView overrides" into ics-mr1
Dianne Hackborn [Thu, 10 Nov 2011 22:12:25 +0000 (14:12 -0800)]
Merge "Fix issue #
5470311: Activity with android:configChanges defined..." into ics-mr1
Adam Powell [Thu, 10 Nov 2011 21:57:24 +0000 (13:57 -0800)]
Merge "Fix bug
5581874 - Animated drawables don't start as expected" into ics-mr1
Martijn Coenen [Thu, 10 Nov 2011 21:48:02 +0000 (13:48 -0800)]
Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1
Chet Haase [Thu, 10 Nov 2011 21:44:34 +0000 (13:44 -0800)]
Merge "increase the rate at which we dispatch events." into ics-mr1
Kenny Root [Thu, 10 Nov 2011 21:18:24 +0000 (13:18 -0800)]
Merge "Close file on exception as well" into ics-mr1
Tom Taylor [Thu, 10 Nov 2011 21:11:16 +0000 (13:11 -0800)]
Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
Eino-Ville Talvala [Thu, 10 Nov 2011 20:07:05 +0000 (12:07 -0800)]
Merge "Add a sound-playing method to Camera API." into ics-mr1
Mathias Agopian [Thu, 10 Nov 2011 18:33:55 +0000 (10:33 -0800)]
Merge "handle EINTR when calling sensor HAL's poll function" into ics-mr1
John Reck [Thu, 10 Nov 2011 17:19:55 +0000 (09:19 -0800)]
Merge "Pause drawing when not visible" into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:48:44 +0000 (08:48 -0800)]
Merge "Send RTSP control connection keep-alive requests" into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:48:34 +0000 (08:48 -0800)]
Merge "Don't believe the PV decoder's lies..." into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:47:25 +0000 (08:47 -0800)]
Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1
George Mount [Thu, 10 Nov 2011 16:32:18 +0000 (08:32 -0800)]
Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1
Eric Laurent [Thu, 10 Nov 2011 16:28:58 +0000 (08:28 -0800)]
Merge "Fix problems in tablet silent mode." into ics-mr1
Wink Saville [Thu, 10 Nov 2011 15:22:35 +0000 (15:22 +0000)]
am
e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
* commit '
e562287c85662457864255028cd4bc3b04f13750':
[maguro] Update COMPREHENSION-TLV parser in CAT
Wink Saville [Thu, 10 Nov 2011 15:20:55 +0000 (07:20 -0800)]
Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
Gilles Debunne [Thu, 10 Nov 2011 08:48:10 +0000 (00:48 -0800)]
Merge "Visual glitches when starting extracted text" into ics-mr1
Dave Burke [Thu, 10 Nov 2011 07:59:32 +0000 (07:59 +0000)]
am
b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
* commit '
b96194308dc8678e99564f038872061e4881e65a':
Actually 59 fps DO NOT MERGE
Dave Burke [Thu, 10 Nov 2011 07:58:09 +0000 (23:58 -0800)]
Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
Dave Burke [Thu, 10 Nov 2011 07:50:45 +0000 (23:50 -0800)]
Actually 59 fps DO NOT MERGE
Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2
Dave Burke [Thu, 10 Nov 2011 07:49:09 +0000 (23:49 -0800)]
Merge "Back to 59fps" into ics-mr1
satok [Thu, 10 Nov 2011 05:26:46 +0000 (21:26 -0800)]
Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
Daniel Sandler [Thu, 10 Nov 2011 04:41:03 +0000 (20:41 -0800)]
Merge "Use platform assets for brightness scrubber." into ics-mr1
Wink Saville [Thu, 10 Nov 2011 03:42:09 +0000 (03:42 +0000)]
am
16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
* commit '
16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
Wink Saville [Thu, 10 Nov 2011 03:39:39 +0000 (19:39 -0800)]
Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
satok [Thu, 10 Nov 2011 02:42:48 +0000 (18:42 -0800)]
Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
Dave Burke [Thu, 10 Nov 2011 00:39:21 +0000 (16:39 -0800)]
Back to 59fps
Change-Id: I8d89e5e27f1abc5a2e36cb832eb4db2ca83c2cc6
Mathias Agopian [Thu, 10 Nov 2011 00:41:43 +0000 (00:41 +0000)]
am
3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
* commit '
3e458306b0caf4e21294acc58286b24bda08a242':
Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
Mathias Agopian [Sat, 5 Nov 2011 01:46:11 +0000 (18:46 -0700)]
Set the WM refresh rate to 60 Hz for tuna devices only DO
NOT MERGE
This approach is TEMPORARY until we can do this properly.
Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
Jim Miller [Wed, 9 Nov 2011 23:19:31 +0000 (15:19 -0800)]
Merge "Fix
5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
Eric Fischer [Wed, 9 Nov 2011 23:18:10 +0000 (23:18 +0000)]
am
3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3124bf64404dbb90cc521abf4c7bf8d438346362':
Import revised translations. DO NOT MERGE