OSDN Git Service
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
The Android Open Source Project [Tue, 1 Nov 2011 21:28:57 +0000 (14:28 -0700)]
Reconcile with ics-mr0-release
Change-Id: I14f9c7648ae8cc7403a6c605d12aba8eec553e80
Mangesh Ghiware [Tue, 1 Nov 2011 21:02:05 +0000 (14:02 -0700)]
Merge "Fix setInitialScale() to take display density into account." into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:53:14 +0000 (13:53 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Michael Jurka [Tue, 1 Nov 2011 20:53:02 +0000 (13:53 -0700)]
Merge "Fix: never show recents over lock screen" into ics-mr1
Peter Ng [Tue, 1 Nov 2011 20:45:18 +0000 (13:45 -0700)]
Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 20:30:24 +0000 (13:30 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
Robert Greenwalt [Tue, 1 Nov 2011 20:29:42 +0000 (20:29 +0000)]
am
bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '
bd9b1528051a1b257768fdbc5077a2d4473b02dd':
Add cdma_rmnet4 to list of monitored interfaces
Robert Greenwalt [Tue, 1 Nov 2011 20:27:56 +0000 (13:27 -0700)]
Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
Daniel Sandler [Tue, 1 Nov 2011 20:05:41 +0000 (13:05 -0700)]
Merge "Bring timestamps back to notifications." into ics-mr1
Jim Miller [Tue, 1 Nov 2011 19:45:11 +0000 (12:45 -0700)]
Merge "Fix
5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 19:42:48 +0000 (19:42 +0000)]
am
46e327ca: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '
46e327ca32a29432941ba4487077577b10243aed':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Fabrice Di Meglio [Tue, 1 Nov 2011 19:41:04 +0000 (12:41 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
Mangesh Ghiware [Tue, 1 Nov 2011 18:28:01 +0000 (11:28 -0700)]
Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
Adam Powell [Tue, 1 Nov 2011 17:58:58 +0000 (10:58 -0700)]
Merge "Fix bug
5534667 - Action bar icons need more space on tablet" into ics-mr1
Dianne Hackborn [Tue, 1 Nov 2011 17:42:54 +0000 (10:42 -0700)]
Merge "Various performance and other work." into ics-mr1
Peter Ng [Tue, 1 Nov 2011 17:29:25 +0000 (10:29 -0700)]
Merge "spinner focused states pumped up" into ics-mr1
The Android Open Source Project [Tue, 1 Nov 2011 17:10:39 +0000 (17:10 +0000)]
am
9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '
9eb4c891a3db118f2546af7593c6251f3210f3ef':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Tue, 1 Nov 2011 17:08:14 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
Philip Milne [Tue, 1 Nov 2011 16:30:21 +0000 (09:30 -0700)]
Merge " Update to fix for bug
5393156" into ics-mr1
The Android Automerger [Tue, 1 Nov 2011 13:28:37 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jim Miller [Tue, 1 Nov 2011 07:49:46 +0000 (07:49 +0000)]
am
1dce37bd: Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '
1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
Fix
5497305: Make sure we show SIM unlock when "None" is selected
Jim Miller [Tue, 1 Nov 2011 07:47:44 +0000 (00:47 -0700)]
Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
Chih-Chung Chang [Tue, 1 Nov 2011 04:05:45 +0000 (04:05 +0000)]
am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
Chih-Chung Chang [Tue, 1 Nov 2011 04:04:01 +0000 (21:04 -0700)]
Merge "Update camera continuous autofocus javadoc." into ics-mr0
Jamie Gennis [Fri, 13 May 2011 00:39:03 +0000 (17:39 -0700)]
BlobCache: implement cache serialization
This change adds serialization and deserialization functionality to
BlobCache, conforming to the Flattenable interface.
Change-Id: Ibc99cb1c3d015f363d57d0713eabccec07ff975e
Jamie Gennis [Mon, 31 Oct 2011 01:10:41 +0000 (18:10 -0700)]
BlobCache: remove the mutex locking
This change removes the mutex from the BlobCache class. The caller must
be responsible for thread synchronization in order to properly implement
the Flattenable interface, which is coming soon. Otherwise would be the
potential for the cache contents to change between the call to the
getFlattenedSize and flatten methods. Because the caller must do this
synchronization anyway there's no reason to also some synchronization
inside BlobCache.
Change-Id: Ie1f4f6f82b78744f46a41ce863cac0cad276a20e
satok [Tue, 1 Nov 2011 01:20:48 +0000 (18:20 -0700)]
Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
Adam Powell [Tue, 1 Nov 2011 01:18:33 +0000 (18:18 -0700)]
Merge "Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
Stephen Hines [Tue, 1 Nov 2011 00:16:56 +0000 (00:16 +0000)]
am
af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit '
af675222f6340a8a9edbe9e8635014a18521e5e0':
Fix potential segfault in RS watchdog.
Stephen Hines [Tue, 1 Nov 2011 00:14:58 +0000 (17:14 -0700)]
Merge "Fix potential segfault in RS watchdog." into ics-mr0
The Android Automerger [Mon, 31 Oct 2011 23:47:11 +0000 (16:47 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
Eric Laurent [Mon, 31 Oct 2011 23:23:15 +0000 (23:23 +0000)]
am
6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '
6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
Fix volume indication in vibrate mode.
OSDN Git Service
