OSDN Git Service
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
Eric Fischer [Wed, 9 Nov 2011 23:15:42 +0000 (15:15 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Robert Ly [Wed, 9 Nov 2011 21:25:45 +0000 (21:25 +0000)]
am
bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
* commit '
bd4bdbec62776b1222b1f202e44f8f127bfb7bab':
docs: update samples toc for rs sample
Robert Ly [Wed, 9 Nov 2011 21:23:34 +0000 (13:23 -0800)]
Merge "docs: update samples toc for rs sample" into ics-mr0
Jamie Gennis [Wed, 9 Nov 2011 19:46:45 +0000 (11:46 -0800)]
Merge "EGL: add deferred saving of the cache" into ics-mr1
Jeff Brown [Wed, 9 Nov 2011 19:20:24 +0000 (11:20 -0800)]
Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug:
5578022" into ics-mr1
Peter Ng [Wed, 9 Nov 2011 18:57:23 +0000 (10:57 -0800)]
Merge "Making quicksettings opaque again" into ics-mr1
John Reck [Wed, 9 Nov 2011 17:28:11 +0000 (09:28 -0800)]
Merge "Fix determining find on page overlap" into ics-mr1
The Android Open Source Project [Wed, 9 Nov 2011 17:00:40 +0000 (09:00 -0800)]
Reconcile with ics-mr0-release
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
Jean-Michel Trivi [Wed, 9 Nov 2011 16:57:43 +0000 (08:57 -0800)]
Merge "Bug
5585323 New system permission for media decode" into ics-mr1
David Brown [Wed, 9 Nov 2011 16:41:20 +0000 (16:41 +0000)]
am
59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
* commit '
59882fb8e0ba7c47b780d62c9a9c46b63d779677':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
Glenn Kasten [Wed, 9 Nov 2011 16:41:19 +0000 (16:41 +0000)]
am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
19998120f53caceb620f138c6eea182f1e693660':
Bug
5478024 drop after decode if can't drop before
Jake Hamby [Wed, 9 Nov 2011 16:40:59 +0000 (16:40 +0000)]
am
fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
* commit '
fee5f29b22f99bd2891fb2af54669f20832fb851':
Fix exception when sending multi-page SMS with Turkish characters.
Eric Laurent [Wed, 9 Nov 2011 16:27:18 +0000 (08:27 -0800)]
Merge "Fix regression for SoundPool playback" into ics-mr1
Brian Colonna [Wed, 9 Nov 2011 15:35:12 +0000 (15:35 +0000)]
am
04217efb: Merge "Fix
5514230: preventing null window token from occurring" into ics-mr0
* commit '
04217efb8eaebdbd846671a2f743fa3e960b5dde':
Fix
5514230: preventing null window token from occurring
The Android Automerger [Wed, 9 Nov 2011 14:28:43 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Gilles Debunne [Wed, 9 Nov 2011 08:26:46 +0000 (00:26 -0800)]
Merge "Bug
5575396: close spell session on language change" into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:58 +0000 (23:43 -0800)]
Merge "Bootstrap stats before registering listeners." into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:38 +0000 (23:43 -0800)]
Merge "Make operation counts monotonically increase." into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:23 +0000 (23:43 -0800)]
Merge "Dispatch alerts through background thread." into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:12 +0000 (23:43 -0800)]
Merge "Make policy data enabled flag static." into ics-mr1
Daniel Sandler [Wed, 9 Nov 2011 04:35:45 +0000 (20:35 -0800)]
Merge "Add day of week." into ics-mr1
David Brown [Wed, 9 Nov 2011 02:25:30 +0000 (18:25 -0800)]
Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
Mathias Agopian [Wed, 9 Nov 2011 02:01:21 +0000 (18:01 -0800)]
Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 01:59:36 +0000 (17:59 -0800)]
EGL: add deferred saving of the cache
This change causes any insertions into the EGL cache to trigger an
attempt to save the cache contents to disk. The save operation is
deferred to allow multiple cache insertions to be batched up.
Change-Id: I6cfec9c0dbbef94d3f8880860e2a365dccc296c7
Dianne Hackborn [Wed, 9 Nov 2011 01:58:26 +0000 (17:58 -0800)]
Merge "Don't crash if there is no connectivity service." into ics-mr1
Svetoslav Ganov [Wed, 9 Nov 2011 01:33:49 +0000 (17:33 -0800)]
Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
Glenn Kasten [Wed, 9 Nov 2011 01:31:32 +0000 (17:31 -0800)]
Merge "Bug
5478024 drop after decode if can't drop before" into ics-mr0
Jeff Sharkey [Wed, 9 Nov 2011 01:27:03 +0000 (17:27 -0800)]
Merge "Avoid inconsistent state when remove fails." into ics-mr1
Jeff Brown [Wed, 9 Nov 2011 01:22:06 +0000 (17:22 -0800)]
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662" into ics-mr1
Mathias Agopian [Wed, 9 Nov 2011 01:20:59 +0000 (17:20 -0800)]
Merge "SensorService now always clamps the requested rate" into ics-mr1
Dianne Hackborn [Wed, 9 Nov 2011 01:01:05 +0000 (17:01 -0800)]
Merge "Add drop box reports of low memory." into ics-mr1
Michael Kolb [Wed, 9 Nov 2011 00:34:53 +0000 (16:34 -0800)]
Merge "Remove flicker from WebTextView" into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 00:15:26 +0000 (16:15 -0800)]
Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 00:14:44 +0000 (16:14 -0800)]
Merge changes I18e5e789,I5cbaae2d into ics-mr1
* changes:
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
Mathias Agopian [Tue, 8 Nov 2011 23:55:55 +0000 (15:55 -0800)]
Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
Jamie Gennis [Tue, 8 Nov 2011 01:03:54 +0000 (17:03 -0800)]
EGL: implement loading and saving the cache
This change adds support for saving and loading the contents of the EGL
cache. It also adds some simple tests for the EGL cache.
Change-Id: I18e5e789e0897a0783d29d1c1e64d26de2dd44c4
Irfan Sheriff [Tue, 8 Nov 2011 23:51:43 +0000 (15:51 -0800)]
Merge "Convert soft ap config store to state machine" into ics-mr1
Dave Santoro [Tue, 8 Nov 2011 22:48:21 +0000 (14:48 -0800)]
Merge "Unhide social stream APIs for Contacts." into ics-mr1
Adam Powell [Tue, 8 Nov 2011 22:32:29 +0000 (14:32 -0800)]
Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
Jake Hamby [Tue, 8 Nov 2011 21:22:34 +0000 (13:22 -0800)]
Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0