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
Eric Laurent
3f13dd0648
Merge "Remove unreliable effect tests." into ics-mr1
2011-11-03 08:45:43 -07:00
The Android Automerger
fd4f0cdc3a
merge in ics-mr0-release history after reset to ics-mr0
2011-11-03 06:33:29 -07:00
Daniel Sandler
8b82413ffa
Merge "Bring back Android Dreams." into ics-mr1
2011-11-03 03:56:49 -07:00
satok
73eb27d22c
Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1
2011-11-03 02:09:32 -07:00
Jeff Sharkey
2002b188b4
Merge "Correct proc file reader, optimizations." into ics-mr1
2011-11-03 00:32:22 -07:00
Dianne Hackborn
76c4bd6a4b
Merge "More performance work:" into ics-mr1
2011-11-02 22:31:19 -07:00
The Android Automerger
e8dc810f7c
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
...
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-11-02 20:58:00 -07:00
The Android Automerger
e4af9b8ecf
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-11-02 20:53:06 -07:00
Eric Fischer
13544d0668
am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
Import revised translations. DO NOT MERGE
2011-11-03 00:04:10 +00:00
Katie McCormick
4dd25d2473
am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
...
* commit 'e08be659eba742d117d24f642a95ba65e13bd015':
Doc change: Update instructions to match ICS UI
2011-11-03 00:04:09 +00:00
Eric Fischer
d6474254b8
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-02 16:17:03 -07:00
Adam Powell
dbc5f6ce5d
Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1
2011-11-02 15:44:31 -07:00
Katie McCormick
3ad9593529
Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
2011-11-02 15:42:18 -07:00
Irfan Sheriff
6c9bd888a7
am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
...
* commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
Avoid duplicate dialogs leading to NPE
2011-11-02 21:38:55 +00:00
Irfan Sheriff
712fd592e0
Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
2011-11-02 14:37:19 -07:00
Robert Greenwalt
5333e1f764
am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0
...
* commit '451fa13e82ea1226895b41282fdb33bf9fea5d19':
Ignore errors when untethering
2011-11-02 21:28:33 +00:00
Robert Greenwalt
a90153f696
Merge "Ignore errors when untethering" into ics-mr0
2011-11-02 14:26:45 -07:00
Scott Main
7b5e2b93be
am aea8d850: docs: a couple typos bugs 5552478 5553096
...
* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11':
docs: a couple typos bugs 5552478 5553096
2011-11-02 19:10:21 +00:00
Svetoslav Ganov
aba3c0c36c
Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
2011-11-02 11:51:58 -07:00