Eric Fischer
16364a0796
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-07 12:36:02 -08:00
Amith Yamasani
6532722306
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
2011-11-07 10:57:17 -08:00
Winson Chung
8241bb39c6
Merge "Fixing screenshot border asset." into ics-mr1
2011-11-07 10:20:37 -08:00
Daniel Sandler
70404410db
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.
2011-11-07 10:11:52 -08:00
The Android Open Source Project
2642a74b99
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
2011-11-07 08:22:56 -08:00
The Android Automerger
0689c381b7
merge in ics-mr0-release history after reset to ics-mr0
2011-11-06 06:28:19 -08:00
Dianne Hackborn
1f0509b675
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.
2011-11-05 07:34:03 +00:00
The Android Automerger
d17aaaee47
merge in ics-mr0-release history after reset to ics-mr0
2011-11-05 00:33:21 -07:00
Dianne Hackborn
d119913c7f
Merge "Print out memory info when we get into a low memory situation." into ics-mr0
2011-11-05 00:31:17 -07:00
Jeff Brown
06234b37e3
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
2011-11-04 22:16:39 -07:00
Mathias Agopian
2b0b7a92fc
Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
2011-11-04 19:57:59 -07:00
Jeff Brown
efd912c05c
am 5462bc63: Fix a leak in Parcel::writeBlob.
...
* commit '5462bc6318b4b70e7a58c66994e2bd79f59d9739':
Fix a leak in Parcel::writeBlob.
2011-11-05 02:35:57 +00:00
Jeff Brown
93ff1f985e
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
2011-11-04 19:26:03 -07:00
Mathias Agopian
385977f6d6
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
2011-11-04 18:46:11 -07:00
Romain Guy
60e2245b63
Merge "Memory optimizations for libhwui Bug #5566149 " into ics-mr1
2011-11-04 16:35:35 -07:00
Robert Greenwalt
7972d26cec
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
edc0bf5536
Merge "Start using IP tool for advanced routing." into ics-mr0
2011-11-04 15:53:37 -07:00
The Android Automerger
31f4de3e67
merge in ics-mr0-release history after reset to ics-mr0
2011-11-04 15:40:13 -07:00
Jamie Gennis
33e55a9545
Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
2011-11-04 15:10:11 -07:00
Jamie Gennis
aca51c06f3
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
2011-11-04 15:01:51 -07:00
Dianne Hackborn
e76a881d78
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.
2011-11-04 21:01:40 +00:00
Dianne Hackborn
d0af48a2a4
Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
2011-11-04 14:00:21 -07:00
Dave Burke
f11ecc7c72
am 3ee47188: Frame rate to 48 fps
...
* commit '3ee471889b09d90affddd00c409a515a64b6861b':
Frame rate to 48 fps
2011-11-04 20:55:30 +00:00
Mathias Agopian
d9440fe166
Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
2011-11-04 12:13:36 -07:00
Irfan Sheriff
9fbfb87f2d
Merge "Avoid quick shutdown after a driver start" into ics-mr1
2011-11-04 11:47:27 -07:00
Narayan Kamath
e5a4dc2bb3
Merge "Add an API for querying / enabling network TTS support." into ics-mr1
2011-11-04 11:01:57 -07:00
Chet Haase
a9c23ad3d8
Merge "Improve Launcher drag performance." into ics-mr1
2011-11-04 11:01:25 -07:00
Dianne Hackborn
5a5206c61f
Merge "Include showmap output in bug report." into ics-mr1
2011-11-04 10:46:09 -07:00
Amith Yamasani
d4a8083581
Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
2011-11-04 10:41:10 -07:00
Flavio Lerda
47f3f725d0
Merge "Add a query parameter to look-up a SIP address." into ics-mr1
2011-11-04 09:48:18 -07:00
Eric Laurent
e2c4e9ba66
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
2011-11-04 08:29:30 -07:00
Eric Laurent
44d5fa3aa5
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
2011-11-04 08:27:45 -07:00
The Android Open Source Project
2009c2f06c
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
2011-11-04 07:56:43 -07:00
Wink Saville
ee0e44271a
am e4ca9242: Fix the build.
...
* commit 'e4ca92421cc07c2f7f152b774dd1ac7a8944028b':
Fix the build.
2011-11-04 11:59:29 +00:00
Dave Burke
14c82e0af9
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.
2011-11-04 11:59:27 +00:00
Wink Saville
e0d02e00bf
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.
2011-11-04 11:59:25 +00:00
Katie McCormick
f4af7e7467
am 6c5951bf: Doc change: Updating device-admin with camera info.
...
* commit '6c5951bf9798369d335096f1f73ee1299cf903ff':
Doc change: Updating device-admin with camera info.
2011-11-04 11:28:39 +00:00
Ken Wakasa
6d52d9c26c
Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
2011-11-04 01:02:12 -07:00
Dave Burke
e11ccb28d1
Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0
2011-11-03 21:59:20 -07:00
Wink Saville
de6499254b
Merge "Separate data stall detection and recovery from net stats." into ics-mr0
2011-11-03 21:26:35 -07:00
Irfan Sheriff
c5e0f4ff35
Merge "Reset IP failure counter on a success" into ics-mr1
2011-11-03 16:06:07 -07:00
Christopher Tate
59c37194bb
Merge "Add persistent property to disable strict mode" into ics-mr1
2011-11-03 15:59:47 -07:00
Mangesh Ghiware
233691c340
Merge "Update fix to restore view and text wrap scales." into ics-mr1
2011-11-03 15:35:23 -07:00
Dianne Hackborn
fd5178892c
Merge "Some optimizations for view inflation." into ics-mr1
2011-11-03 15:16:11 -07:00
Kenny Root
251d5b274f
Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1
2011-11-03 14:47:07 -07:00
Scott Main
e5aa119222
am 95142919: docs: dashboard update for 11/3
...
* commit '9514291901e3a1274e30c2e809ad38e22e7f662e':
docs: dashboard update for 11/3
2011-11-03 21:06:29 +00:00
Jamie Gennis
9f8b1cecc8
Merge "SurfaceTexture: various logging improvements" into ics-mr1
2011-11-03 11:51:38 -07:00
Jamie Gennis
3aed920fcc
Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
...
* changes:
BlobCache: implement cache serialization
BlobCache: remove the mutex locking
2011-11-03 11:51:23 -07:00
Jeff Sharkey
6534d369b7
Merge "Verify AppWidget ownership during update." into ics-mr1
2011-11-03 11:43:52 -07:00
Teng-Hui Zhu
a32ea7fea7
Merge "Create GL texture when it is missing for video layer" into ics-mr1
2011-11-03 11:43:16 -07:00