OSDN Git Service
Dave Burke [Thu, 10 Nov 2011 00:39:21 +0000 (16:39 -0800)]
Back to 59fps
Change-Id: I8d89e5e27f1abc5a2e36cb832eb4db2ca83c2cc6
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
Wei Huang [Tue, 8 Nov 2011 21:16:02 +0000 (13:16 -0800)]
Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
Brian Colonna [Tue, 8 Nov 2011 20:51:36 +0000 (12:51 -0800)]
Merge "Fix
5514230: preventing null window token from occurring" into ics-mr0
Matthew Xie [Tue, 8 Nov 2011 20:19:37 +0000 (12:19 -0800)]
Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
Dianne Hackborn [Tue, 8 Nov 2011 19:52:58 +0000 (11:52 -0800)]
Merge "Cleanup remote execution of perf tests." into ics-mr1
The Android Open Source Project [Tue, 8 Nov 2011 19:08:20 +0000 (11:08 -0800)]
Reconcile with ics-mr0-release
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
Adam Cohen [Tue, 8 Nov 2011 18:53:39 +0000 (10:53 -0800)]
Merge "Making default widget padding public API" into ics-mr1
Robert Greenwalt [Tue, 8 Nov 2011 18:31:37 +0000 (10:31 -0800)]
Merge "Fix build." into ics-mr1
Adam Powell [Tue, 8 Nov 2011 18:06:00 +0000 (10:06 -0800)]
Merge "Fix bug
5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1
Danielle Millett [Tue, 8 Nov 2011 18:03:24 +0000 (10:03 -0800)]
Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
Robert Greenwalt [Tue, 8 Nov 2011 18:01:07 +0000 (10:01 -0800)]
Merge "Wimax : wimax framework related open source." into ics-mr1
Tom Taylor [Tue, 8 Nov 2011 17:00:22 +0000 (09:00 -0800)]
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
Andreas Huber [Tue, 8 Nov 2011 16:48:31 +0000 (08:48 -0800)]
Merge "Remove surface legacy APIs and code." into ics-mr1
John Reck [Tue, 8 Nov 2011 16:38:07 +0000 (08:38 -0800)]
Merge "Remove unnecessary memory allocations" into ics-mr1
Eric Laurent [Tue, 8 Nov 2011 16:32:57 +0000 (08:32 -0800)]
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
The Android Automerger [Tue, 8 Nov 2011 14:41:10 +0000 (06:41 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Narayan Kamath [Tue, 8 Nov 2011 10:09:18 +0000 (02:09 -0800)]
Merge "Fix a bug in the network TTS api." into ics-mr1
Gilles Debunne [Tue, 8 Nov 2011 08:48:27 +0000 (00:48 -0800)]
Merge "No more context menu in TextView" into ics-mr1
Chih-Chung Chang [Tue, 8 Nov 2011 06:59:55 +0000 (22:59 -0800)]
Merge "Fix
5509346: Resize the thumbnails if it's too large." into ics-mr1
James Dong [Tue, 8 Nov 2011 06:57:02 +0000 (22:57 -0800)]
Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
Matthew Xie [Tue, 8 Nov 2011 06:42:00 +0000 (22:42 -0800)]
Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
Mathias Agopian [Tue, 8 Nov 2011 05:58:03 +0000 (21:58 -0800)]
Fix an issue where we could wait for a non-existing transaction
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"
Note: the system would recover after a 5 second timeout.
Bug:
5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
Mathias Agopian [Tue, 8 Nov 2011 05:33:53 +0000 (21:33 -0800)]
Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
Daniel Sandler [Tue, 8 Nov 2011 03:47:51 +0000 (19:47 -0800)]
Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
Dianne Hackborn [Tue, 8 Nov 2011 02:46:54 +0000 (18:46 -0800)]
Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
Adam Powell [Tue, 8 Nov 2011 01:55:17 +0000 (17:55 -0800)]
Merge "Fix bug
5534414 - Unselected tab states for Holo" into ics-mr1
John Wang [Tue, 8 Nov 2011 00:46:11 +0000 (16:46 -0800)]
Merge "Remain in call audio mode while phone is offhook." into ics-mr1
Robert Greenwalt [Mon, 7 Nov 2011 23:36:28 +0000 (23:36 +0000)]
am
b445362b: Make upstream tether list threadsafe
* commit '
b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
Make upstream tether list threadsafe
John Reck [Mon, 7 Nov 2011 23:20:38 +0000 (15:20 -0800)]
Merge "Remove nativeRecordButtons" into ics-mr1
Adam Powell [Mon, 7 Nov 2011 22:56:36 +0000 (14:56 -0800)]
Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
Peter Ng [Mon, 7 Nov 2011 22:37:31 +0000 (14:37 -0800)]
Merge "Added focused state to quickcontacts shortcut" into ics-mr1
Jim Miller [Mon, 7 Nov 2011 22:24:43 +0000 (14:24 -0800)]
Merge "Fix
5231823: PIN/Password polish on lock screen" into ics-mr1
Peter Ng [Mon, 7 Nov 2011 21:40:45 +0000 (13:40 -0800)]
Merge "Color balancing framework assets" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:36:02 +0000 (12:36 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Amith Yamasani [Mon, 7 Nov 2011 18:57:17 +0000 (10:57 -0800)]
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
Jamie Gennis [Sun, 6 Nov 2011 22:14:33 +0000 (14:14 -0800)]
EGL: use an in-memory the blob cache
This change makes the makes the stub EGL_ANDROID_blob_cache callbacks
actually use a BlobCache object.
Bug:
5474671
Change-Id: I5cbaae2dea3aad2fe306c9f57029c3f215a0863a
Winson Chung [Mon, 7 Nov 2011 18:20:37 +0000 (10:20 -0800)]
Merge "Fixing screenshot border asset." into ics-mr1
Daniel Sandler [Mon, 7 Nov 2011 18:11:52 +0000 (10:11 -0800)]
Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
The Android Open Source Project [Mon, 7 Nov 2011 16:22:56 +0000 (08:22 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
The Android Automerger [Sun, 6 Nov 2011 14:28:19 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Sat, 5 Nov 2011 07:34:03 +0000 (07:34 +0000)]
am
7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '
7311bd4b709750384b058d8e988e2e983c97b3f2':
Print out memory info when we get into a low memory situation.
The Android Automerger [Sat, 5 Nov 2011 07:33:21 +0000 (00:33 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Sat, 5 Nov 2011 07:31:17 +0000 (00:31 -0700)]
Merge "Print out memory info when we get into a low memory situation." into ics-mr0
Jeff Brown [Sat, 5 Nov 2011 02:01:44 +0000 (19:01 -0700)]
Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug:
5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
Mathias Agopian [Sat, 5 Nov 2011 02:57:59 +0000 (19:57 -0700)]
Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
Jeff Brown [Sat, 5 Nov 2011 02:35:57 +0000 (02:35 +0000)]
am
5462bc63: Fix a leak in Parcel::writeBlob.
* commit '
5462bc6318b4b70e7a58c66994e2bd79f59d9739':
Fix a leak in Parcel::writeBlob.
Jeff Brown [Sat, 5 Nov 2011 02:01:44 +0000 (19:01 -0700)]
Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug:
5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
Mathias Agopian [Sat, 5 Nov 2011 01:46:11 +0000 (18:46 -0700)]
workaround to set the WM refresh rate to 48 Hz for tuna devices only
this is TEMPORARY until we can do this properly.
Bug:
5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
Romain Guy [Fri, 4 Nov 2011 23:35:35 +0000 (16:35 -0700)]
Merge "Memory optimizations for libhwui Bug #
5566149" into ics-mr1
Robert Greenwalt [Fri, 4 Nov 2011 22:55:30 +0000 (22:55 +0000)]
am
348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '
348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
Robert Greenwalt [Fri, 4 Nov 2011 22:53:37 +0000 (15:53 -0700)]
Merge "Start using IP tool for advanced routing." into ics-mr0
The Android Automerger [Fri, 4 Nov 2011 22:40:13 +0000 (15:40 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Mathias Agopian [Tue, 1 Nov 2011 21:39:06 +0000 (14:39 -0700)]
Fix rotation displays frame N-1 briefly while rotating
The ScreenShot layer is now created hidden. The screenshot itself
is aquired during the transaction when the layer is made visible.
This guarantees the screenshot and the layer happen atomically
with respect to screen updates.
Bug:
5534521
Change-Id: Ida23e1f13d5716ec83b78a15712e0646d6cf8729
Jamie Gennis [Fri, 4 Nov 2011 22:10:11 +0000 (15:10 -0700)]
Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
Jamie Gennis [Fri, 4 Nov 2011 00:42:43 +0000 (17:42 -0700)]
EGL: Add stubs for EGL_ANDROID_blob_cache
This change adds a stub cache implementation that gets passed to the
underlying EGL implementation at initialization time.
Change-Id: I14437c5b6f91b7a34a19bb02ad802e6e54f88d2a
Dianne Hackborn [Fri, 4 Nov 2011 21:01:40 +0000 (21:01 +0000)]
am
ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit '
ca25016775391bf71f7503aeb61798df46fa54cf':
DO NOT MERGE. Integrate: Include showmap output in bug report.
Dianne Hackborn [Fri, 4 Nov 2011 21:00:21 +0000 (14:00 -0700)]
Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
Dave Burke [Fri, 4 Nov 2011 20:55:30 +0000 (20:55 +0000)]
am
3ee47188: Frame rate to 48 fps
* commit '
3ee471889b09d90affddd00c409a515a64b6861b':
Frame rate to 48 fps
OSDN Git Service
