OSDN Git Service
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
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
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
Mathias Agopian [Fri, 4 Nov 2011 19:13:36 +0000 (12:13 -0700)]
Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
Irfan Sheriff [Fri, 4 Nov 2011 18:47:27 +0000 (11:47 -0700)]
Merge "Avoid quick shutdown after a driver start" into ics-mr1
Narayan Kamath [Fri, 4 Nov 2011 18:01:57 +0000 (11:01 -0700)]
Merge "Add an API for querying / enabling network TTS support." into ics-mr1
Chet Haase [Fri, 4 Nov 2011 18:01:25 +0000 (11:01 -0700)]
Merge "Improve Launcher drag performance." into ics-mr1
Dianne Hackborn [Fri, 4 Nov 2011 17:46:09 +0000 (10:46 -0700)]
Merge "Include showmap output in bug report." into ics-mr1
Amith Yamasani [Fri, 4 Nov 2011 17:41:10 +0000 (10:41 -0700)]
Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
Flavio Lerda [Fri, 4 Nov 2011 16:48:18 +0000 (09:48 -0700)]
Merge "Add a query parameter to look-up a SIP address." into ics-mr1
Eric Laurent [Fri, 4 Nov 2011 15:29:30 +0000 (08:29 -0700)]
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
Eric Laurent [Fri, 4 Nov 2011 15:27:45 +0000 (08:27 -0700)]
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
The Android Open Source Project [Fri, 4 Nov 2011 14:56:42 +0000 (07:56 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
Wink Saville [Fri, 4 Nov 2011 11:59:29 +0000 (11:59 +0000)]
Dave Burke [Fri, 4 Nov 2011 11:59:27 +0000 (11:59 +0000)]
am
32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '
32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Wink Saville [Fri, 4 Nov 2011 11:59:25 +0000 (11:59 +0000)]
am
3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
* commit '
3d7084519b03da0681da13fb8d7d4a0914d11646':
Separate data stall detection and recovery from net stats.
Katie McCormick [Fri, 4 Nov 2011 11:28:39 +0000 (11:28 +0000)]
am
6c5951bf: Doc change: Updating device-admin with camera info.
* commit '
6c5951bf9798369d335096f1f73ee1299cf903ff':
Doc change: Updating device-admin with camera info.
Ken Wakasa [Fri, 4 Nov 2011 08:02:12 +0000 (01:02 -0700)]
Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
Dave Burke [Fri, 4 Nov 2011 04:59:20 +0000 (21:59 -0700)]
Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0
Wink Saville [Fri, 4 Nov 2011 04:26:35 +0000 (21:26 -0700)]
Merge "Separate data stall detection and recovery from net stats." into ics-mr0
Irfan Sheriff [Thu, 3 Nov 2011 23:06:07 +0000 (16:06 -0700)]
Merge "Reset IP failure counter on a success" into ics-mr1
Christopher Tate [Thu, 3 Nov 2011 22:59:47 +0000 (15:59 -0700)]
Merge "Add persistent property to disable strict mode" into ics-mr1
Mangesh Ghiware [Thu, 3 Nov 2011 22:35:23 +0000 (15:35 -0700)]
Merge "Update fix to restore view and text wrap scales." into ics-mr1
Dianne Hackborn [Thu, 3 Nov 2011 22:16:11 +0000 (15:16 -0700)]
Merge "Some optimizations for view inflation." into ics-mr1
Kenny Root [Thu, 3 Nov 2011 21:47:07 +0000 (14:47 -0700)]
Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1
Scott Main [Thu, 3 Nov 2011 21:06:29 +0000 (21:06 +0000)]
am
95142919: docs: dashboard update for 11/3
* commit '
9514291901e3a1274e30c2e809ad38e22e7f662e':
docs: dashboard update for 11/3
Jamie Gennis [Thu, 3 Nov 2011 18:51:38 +0000 (11:51 -0700)]
Merge "SurfaceTexture: various logging improvements" into ics-mr1
Jamie Gennis [Thu, 3 Nov 2011 18:51:23 +0000 (11:51 -0700)]
Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
* changes:
BlobCache: implement cache serialization
BlobCache: remove the mutex locking
Jeff Sharkey [Thu, 3 Nov 2011 18:43:52 +0000 (11:43 -0700)]
Merge "Verify AppWidget ownership during update." into ics-mr1
Teng-Hui Zhu [Thu, 3 Nov 2011 18:43:16 +0000 (11:43 -0700)]
Merge "Create GL texture when it is missing for video layer" into ics-mr1
Eric Laurent [Thu, 3 Nov 2011 15:45:43 +0000 (08:45 -0700)]
Merge "Remove unreliable effect tests." into ics-mr1
The Android Automerger [Thu, 3 Nov 2011 13:33:29 +0000 (06:33 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Daniel Sandler [Thu, 3 Nov 2011 10:56:49 +0000 (03:56 -0700)]
Merge "Bring back Android Dreams." into ics-mr1
satok [Thu, 3 Nov 2011 09:09:32 +0000 (02:09 -0700)]
Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1
Jeff Sharkey [Thu, 3 Nov 2011 07:32:22 +0000 (00:32 -0700)]
Merge "Correct proc file reader, optimizations." into ics-mr1
Dianne Hackborn [Thu, 3 Nov 2011 05:31:19 +0000 (22:31 -0700)]
Merge "More performance work:" into ics-mr1
The Android Automerger [Thu, 3 Nov 2011 03:58:00 +0000 (20:58 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
The Android Automerger [Thu, 3 Nov 2011 03:53:06 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
Eric Fischer [Thu, 3 Nov 2011 00:04:10 +0000 (00:04 +0000)]
am
8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
Import revised translations. DO NOT MERGE
Katie McCormick [Thu, 3 Nov 2011 00:04:09 +0000 (00:04 +0000)]
am
e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
* commit '
e08be659eba742d117d24f642a95ba65e13bd015':
Doc change: Update instructions to match ICS UI
Eric Fischer [Wed, 2 Nov 2011 23:17:03 +0000 (16:17 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Adam Powell [Wed, 2 Nov 2011 22:44:31 +0000 (15:44 -0700)]
Merge "Fix bug
5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1
Katie McCormick [Wed, 2 Nov 2011 22:42:18 +0000 (15:42 -0700)]
Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 21:38:55 +0000 (21:38 +0000)]
am
7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
* commit '
7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
Avoid duplicate dialogs leading to NPE
Irfan Sheriff [Wed, 2 Nov 2011 21:37:19 +0000 (14:37 -0700)]
Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
Robert Greenwalt [Wed, 2 Nov 2011 21:28:33 +0000 (21:28 +0000)]
am
451fa13e: Merge "Ignore errors when untethering" into ics-mr0
* commit '
451fa13e82ea1226895b41282fdb33bf9fea5d19':
Ignore errors when untethering
Robert Greenwalt [Wed, 2 Nov 2011 21:26:45 +0000 (14:26 -0700)]
Merge "Ignore errors when untethering" into ics-mr0
Scott Main [Wed, 2 Nov 2011 19:10:21 +0000 (19:10 +0000)]
Svetoslav Ganov [Wed, 2 Nov 2011 18:51:58 +0000 (11:51 -0700)]
Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
Peter Ng [Wed, 2 Nov 2011 18:47:04 +0000 (11:47 -0700)]
Merge "Make the notification panel header opaque." into ics-mr1
Peter Ng [Wed, 2 Nov 2011 18:46:32 +0000 (11:46 -0700)]
Merge "making slide unlock on tablet have a larger radius" into ics-mr1
Amith Yamasani [Wed, 2 Nov 2011 18:43:53 +0000 (11:43 -0700)]
Merge "Don't expand the SearchView if already expanded." into ics-mr1
The Android Open Source Project [Wed, 2 Nov 2011 17:52:48 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
Adam Powell [Wed, 2 Nov 2011 17:33:52 +0000 (10:33 -0700)]
Merge "Bug
5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:14:46 +0000 (10:14 -0700)]
Merge "CalendarView title incorrectly updated for different languages." into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:13:55 +0000 (10:13 -0700)]
Merge "Accessibility window query APIs should respect root name space." into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:13:17 +0000 (10:13 -0700)]
Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
The Android Automerger [Wed, 2 Nov 2011 17:05:33 +0000 (10:05 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
The Android Automerger [Wed, 2 Nov 2011 16:48:55 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 13:28:40 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 04:18:14 +0000 (04:18 +0000)]
am
953005e8: Merge "Specify component name for provisioning" into ics-mr0
* commit '
953005e8243e4dc898a00d9a1612ae82772913b9':
Specify component name for provisioning
Jeff Sharkey [Wed, 2 Nov 2011 04:16:13 +0000 (04:16 +0000)]
am
db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
* commit '
db0ab2e731d755f64583c5704fa406bc0e7a2af4':
Process AMS events in NetworkPolicy handler.
Irfan Sheriff [Wed, 2 Nov 2011 04:15:26 +0000 (21:15 -0700)]
Merge "Specify component name for provisioning" into ics-mr0
Jeff Sharkey [Wed, 2 Nov 2011 04:14:35 +0000 (21:14 -0700)]
Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
Dianne Hackborn [Wed, 2 Nov 2011 04:11:18 +0000 (21:11 -0700)]
Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
Fabrice Di Meglio [Wed, 2 Nov 2011 02:17:48 +0000 (02:17 +0000)]
am
bcf05a69: Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
* commit '
bcf05a69090f342d328f1537d1d83406b883290b':
Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
Dianne Hackborn [Wed, 2 Nov 2011 01:02:44 +0000 (18:02 -0700)]
Merge "Some optimizations." into ics-mr1
Adam Powell [Wed, 2 Nov 2011 00:27:26 +0000 (17:27 -0700)]
Merge "Fix bug
5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1
Katie McCormick [Wed, 2 Nov 2011 00:11:01 +0000 (00:11 +0000)]
am
d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
* commit '
d5b25ecc07efb9d7f725731f29241217266b4c0c':
Doc Update: Update list of widget classes
Katie McCormick [Wed, 2 Nov 2011 00:09:44 +0000 (17:09 -0700)]
Merge "Doc Update: Update list of widget classes" into ics-mr0
Jamie Gennis [Wed, 19 Oct 2011 20:36:31 +0000 (13:36 -0700)]
SurfaceTexture: various logging improvements
Change-Id: I1f7216276547a1e9f9343c88c6cc1c24efcdcdbc
Dima Zavin [Tue, 1 Nov 2011 22:32:06 +0000 (22:32 +0000)]
am
f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
* commit '
f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3':
BatteryService(jni): properly handle read's return value
Dima Zavin [Tue, 1 Nov 2011 22:29:42 +0000 (15:29 -0700)]
Merge "BatteryService(jni): properly handle read's return value" into ics-mr0
OSDN Git Service
