OSDN Git Service
Dianne Hackborn [Wed, 16 Nov 2011 22:37:54 +0000 (14:37 -0800)]
am
717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming.
* commit '
717a25dc2a411edb548859cd6870363346c71b01':
Add new ManagedEGLContext class to help apps participate in memory trimming.
Dianne Hackborn [Wed, 16 Nov 2011 22:06:05 +0000 (14:06 -0800)]
am
4c6a65bc: Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '
4c6a65bc319feab120d40553d93b160908db2f6d':
Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in...
Dianne Hackborn [Wed, 16 Nov 2011 22:03:09 +0000 (14:03 -0800)]
Merge "Maybe fix issue #
5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
Robert Greenwalt [Wed, 16 Nov 2011 20:46:23 +0000 (12:46 -0800)]
am
33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1
* commit '
33fe4a36b7d1ef84b13447f2a765db465ef96e56':
Fix TelephonyManager to grab the best context
Robert Greenwalt [Wed, 16 Nov 2011 20:06:53 +0000 (12:06 -0800)]
Merge "Fix TelephonyManager to grab the best context" into ics-mr1
Jamie Gennis [Wed, 16 Nov 2011 19:36:17 +0000 (11:36 -0800)]
am
fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '
fd6b64f6ad040b4d550a5219a2576997e2c0e85d':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Jamie Gennis [Wed, 16 Nov 2011 19:34:30 +0000 (11:34 -0800)]
Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 19:02:20 +0000 (11:02 -0800)]
am
7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
7dc81e06e4d0554683595e8d2e318837548e249a':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:57:45 +0000 (10:57 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Gilles Debunne [Wed, 16 Nov 2011 18:37:23 +0000 (10:37 -0800)]
am
de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1
* commit '
de8c5ec88982b836b2c50d4f685f4e05b29bdd0d':
IME action (done, next...) correctly handled
Gilles Debunne [Wed, 16 Nov 2011 18:31:40 +0000 (10:31 -0800)]
Merge "IME action (done, next...) correctly handled" into ics-mr1
Alex Sakhartchouk [Wed, 16 Nov 2011 17:48:26 +0000 (09:48 -0800)]
am
4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
* commit '
4c593010dddc6d2972bab87b30bd1b11987a09e1':
Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
Fred Chung [Wed, 16 Nov 2011 17:48:20 +0000 (09:48 -0800)]
am
15fe377c: Merge "Bluetooth HDP sample." into ics-mr1
* commit '
15fe377c7cb57c4d758edcfc1d1e53bcf5a0a8bc':
Bluetooth HDP sample.
The Android Open Source Project [Wed, 16 Nov 2011 17:48:16 +0000 (09:48 -0800)]
Alex Sakhartchouk [Wed, 16 Nov 2011 17:40:11 +0000 (09:40 -0800)]
Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
Fred Chung [Wed, 16 Nov 2011 17:31:54 +0000 (09:31 -0800)]
Merge "Bluetooth HDP sample." into ics-mr1
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
The Android Open Source Project [Wed, 16 Nov 2011 15:38:11 +0000 (07:38 -0800)]
am
c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
c7403258528a08ab74f7c29277d0c34ba6edc53d':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
The Android Open Source Project [Wed, 16 Nov 2011 15:33:58 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
Jake Hamby [Wed, 16 Nov 2011 04:19:34 +0000 (20:19 -0800)]
am
bd783684: am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
bd7836846c1e5d3610ba6c26686674d429a4316c':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:19:33 +0000 (20:19 -0800)]
am
c7b35481: am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:19:30 +0000 (20:19 -0800)]
am
cbc96549: am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:16:47 +0000 (20:16 -0800)]
am
4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '
4fdc36e6d6003cdce911678f0b233697554f8dbf':
Document that release() should be called with onPause() and onStop() for media objects
Jake Hamby [Wed, 16 Nov 2011 04:16:12 +0000 (20:16 -0800)]
am
7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
* commit '
7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
Fix 3GPP SMS send failure for 7-bit national language tables.
Bill Gruber [Wed, 16 Nov 2011 04:16:02 +0000 (20:16 -0800)]
am
c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
* commit '
c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
IAB Doc Fix: Error in code snippet Bug
5221766
Adrian Ludwig [Wed, 16 Nov 2011 04:15:57 +0000 (20:15 -0800)]
am
0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
* commit '
0fd69ff4b9311c6b5406b769d50c9aa22787b816':
Adding new "Security Best Practices" to the html docs.
James Dong [Wed, 16 Nov 2011 04:13:03 +0000 (20:13 -0800)]
Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
Adam Powell [Wed, 16 Nov 2011 03:54:04 +0000 (19:54 -0800)]
am
45f05c95: Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '
45f05c9580739ffe2d665cec50efb0bb57d757ba':
Fix bug
5623642 - Status bar background incompatible with some legacy apps
Adam Powell [Wed, 16 Nov 2011 03:51:56 +0000 (19:51 -0800)]
Merge "Fix bug
5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 03:19:04 +0000 (19:19 -0800)]
am
3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1
* commit '
3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
Eliminate hw.keyboards system properties.
Jeff Brown [Wed, 16 Nov 2011 03:17:09 +0000 (19:17 -0800)]
Merge "Eliminate hw.keyboards system properties." into ics-mr1
The Android Automerger [Wed, 16 Nov 2011 03:08:44 +0000 (19:08 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Wed, 16 Nov 2011 03:06:20 +0000 (19:06 -0800)]
am
cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit '
cdec187a27b2acc34cd4df26b836b83362527d6a':
Whoops, need to acquire lock.
Dianne Hackborn [Wed, 16 Nov 2011 03:04:11 +0000 (19:04 -0800)]
Merge "Whoops, need to acquire lock." into ics-mr1
Jean-Michel Trivi [Wed, 16 Nov 2011 02:21:44 +0000 (18:21 -0800)]
am
0ddb0143: Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
* commit '
0ddb0143895b816d4ff5c174b346390e07f26556':
Fix
5623252 unlink to death of audio focus client early
Jean-Michel Trivi [Wed, 16 Nov 2011 02:19:34 +0000 (18:19 -0800)]
Merge "Fix
5623252 unlink to death of audio focus client early" into ics-mr1
Mathias Agopian [Wed, 16 Nov 2011 02:15:18 +0000 (18:15 -0800)]
am
c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1
* commit '
c0fa2a3bce40d52c0f1cccd87f8b0816a6faa6a7':
rework a bit how we manage EGL extensions
Mathias Agopian [Wed, 16 Nov 2011 02:12:00 +0000 (18:12 -0800)]
Merge "rework a bit how we manage EGL extensions" into ics-mr1
Jeff Brown [Wed, 16 Nov 2011 01:48:10 +0000 (17:48 -0800)]
Eliminate hw.keyboards system properties.
Stop using system properties to publish information about
the key character map path. Instead, we can retrieve it
on demand by asking the window manager.
It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.
Bug:
5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
Jim Miller [Wed, 16 Nov 2011 00:18:32 +0000 (16:18 -0800)]
am
c57bfa4a: Fix
5581164: Add abbreviated localized date strings
* commit '
c57bfa4a4bf4c810b5c663df17443463d8192e8f':
Fix
5581164: Add abbreviated localized date strings
Jim Miller [Tue, 15 Nov 2011 23:44:17 +0000 (15:44 -0800)]
am
34a62348: Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
* commit '
34a62348be92034a9fb7582e51754224785568dc':
Fix
5581164: Use abbreviated day in lockscreen
Jim Miller [Tue, 15 Nov 2011 23:42:20 +0000 (15:42 -0800)]
Merge "Fix
5581164: Use abbreviated day in lockscreen" into ics-mr1
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:05:24 +0000 (15:05 -0800)]
am
cce32110: am
d5897dc7: fix for build breakage.
* commit '
cce32110e6f42378a76e0eb2495d24b6c8bc8ae7':
fix for build breakage.
Tsu Chiang Chuang [Tue, 15 Nov 2011 23:00:26 +0000 (15:00 -0800)]
am
d5897dc7: fix for build breakage.
* commit '
d5897dc7985e511c194f839d4b340fed2d63b41c':
fix for build breakage.
Jim Miller [Tue, 15 Nov 2011 22:54:50 +0000 (14:54 -0800)]
am
b35a21f9: Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
* commit '
b35a21f987b99cfe90f4c46e0a708703274b8f46':
Fix
5602985: Show "Emergency calls only" when device has no SIM.
Jim Miller [Tue, 15 Nov 2011 22:51:50 +0000 (14:51 -0800)]
Merge "Fix
5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 22:48:25 +0000 (14:48 -0800)]
am
d5713179: Merge "Override app requested orientation when docked." into ics-mr1
* commit '
d5713179a0f68aa47a8cd966abc5324d43414b63':
Override app requested orientation when docked.
Jeff Brown [Tue, 15 Nov 2011 22:46:17 +0000 (14:46 -0800)]
Merge "Override app requested orientation when docked." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 22:42:11 +0000 (14:42 -0800)]
am
5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
* commit '
5f11d73c918de72368ac5605c50f5fb9ac0457cb':
Improve low memory dropbox reporting.
Dianne Hackborn [Tue, 15 Nov 2011 22:39:37 +0000 (14:39 -0800)]
Merge "Improve low memory dropbox reporting." into ics-mr1
Jake Hamby [Tue, 15 Nov 2011 21:34:57 +0000 (13:34 -0800)]
Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
Mathias Agopian [Tue, 15 Nov 2011 21:06:08 +0000 (13:06 -0800)]
am
3aa684ec: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
3aa684ec0d3f70027fa808fb95b096a1613a1ddc':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Mathias Agopian [Tue, 15 Nov 2011 21:06:06 +0000 (13:06 -0800)]
am
6b3ce09d: Merge "fix crash when validating an invalid EGL objects" into ics-mr1
* commit '
6b3ce09d37fdb53a3a32e688017a5b343398c03b':
fix crash when validating an invalid EGL objects
Mathias Agopian [Tue, 15 Nov 2011 21:03:47 +0000 (13:03 -0800)]
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
Mathias Agopian [Tue, 15 Nov 2011 21:03:22 +0000 (13:03 -0800)]
Merge "fix crash when validating an invalid EGL objects" into ics-mr1
Winson Chung [Tue, 15 Nov 2011 20:45:18 +0000 (12:45 -0800)]
am
e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
* commit '
e5129d7f49361df69e804a79696e28b213ea20b0':
Defer adding large icon until when we compose the final notification. (Bug
5566846)
Winson Chung [Tue, 15 Nov 2011 20:41:56 +0000 (12:41 -0800)]
Merge "Defer adding large icon until when we compose the final notification. (Bug
5566846)" into ics-mr1
Danielle Millett [Tue, 15 Nov 2011 20:21:01 +0000 (12:21 -0800)]
am
49000016: am
8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
* commit '
4900001670c5229fa06e57821a3436023c25520d':
DO NOT MERGE cherry picking from MR0 cl 148223
Danielle Millett [Tue, 15 Nov 2011 20:16:59 +0000 (12:16 -0800)]
am
8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
* commit '
8d8e669ea11d011b3e2320ad5dab580916b6d32e':
DO NOT MERGE cherry picking from MR0 cl 148223
Eric Fischer [Tue, 15 Nov 2011 19:55:54 +0000 (11:55 -0800)]
am
3524831a: am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3524831a633693cf72880299706b2039d41c3b78':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Nov 2011 19:51:38 +0000 (11:51 -0800)]
am
8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
Import revised translations. DO NOT MERGE
Sunita Nadampalli [Thu, 10 Nov 2011 00:23:41 +0000 (18:23 -0600)]
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Surface Texture dequeue logic is modified to return the oldest of the
free buffers to Client on dequeue call.
Currently dequeue method is returning the first buffer index which is free.
The parsing is done in ascending order of the buffer slot indices.
This leads to returning the buffer which has been just queued to composer,
and hence display, and this defeats the purpose of having minimum dequeue count
as 2 in asynchrnouse mode.
This is fixed by checking all the free slots and returning the oldest buffer.
Change-Id: Ibbac10593c3994c278c601af0480b171635ecdd4
Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:13:45 +0000 (11:13 -0800)]
am
b3f2890a: am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
b3f2890a8af3a99be1b0d5fd5a40df656cb60598':
Adding mobile microbenchmark tests.
Tsu Chiang Chuang [Tue, 15 Nov 2011 19:10:44 +0000 (11:10 -0800)]
am
047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
* commit '
047c4de2c548960fff428a92099003593cede5f8':
Adding mobile microbenchmark tests.
Bill Gruber [Tue, 15 Nov 2011 18:57:32 +0000 (10:57 -0800)]
Merge "IAB Doc Fix: Error in code snippet Bug
5221766" into ics-mr0
Adrian Ludwig [Tue, 15 Nov 2011 18:37:28 +0000 (10:37 -0800)]
Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
Gilles Debunne [Tue, 15 Nov 2011 18:02:15 +0000 (10:02 -0800)]
am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
8a440477fd203d74b73b32dc2b357f07dfc36067':
Clean-up in TextView
Gilles Debunne [Tue, 15 Nov 2011 17:59:45 +0000 (09:59 -0800)]
Merge "Clean-up in TextView" into ics-mr1
John Reck [Tue, 15 Nov 2011 17:58:48 +0000 (09:58 -0800)]
am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
Call onScrollChanged when scrolling layers
John Reck [Tue, 15 Nov 2011 17:56:17 +0000 (09:56 -0800)]
Merge "Call onScrollChanged when scrolling layers" into ics-mr1
Hong Teng [Tue, 15 Nov 2011 17:45:29 +0000 (09:45 -0800)]
am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Daniel Sandler [Tue, 15 Nov 2011 17:22:40 +0000 (09:22 -0800)]
am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
ce33622aed7fb25a14ef957cdc78b78cc4602be9':
Bring back the 'more notifications' icon.
Daniel Sandler [Tue, 15 Nov 2011 17:20:56 +0000 (09:20 -0800)]
Merge "Bring back the 'more notifications' icon." into ics-mr1
Jean-Michel Trivi [Tue, 15 Nov 2011 16:58:55 +0000 (08:58 -0800)]
am
538dc6ac: Merge "Fix
5615747 Don\'t leak remote control client death handlers" into ics-mr1
* commit '
538dc6acfd14ea59f0b294531f9417ca04ca621f':
Fix
5615747 Don't leak remote control client death handlers
Jean-Michel Trivi [Tue, 15 Nov 2011 16:56:55 +0000 (08:56 -0800)]
Merge "Fix
5615747 Don't leak remote control client death handlers" into ics-mr1
Wu-cheng Li [Tue, 15 Nov 2011 14:16:21 +0000 (06:16 -0800)]
am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
b90a70d1542edd5a95e73b75192e6eb5a66401cc':
Improve camera face detection javadoc.
Wu-cheng Li [Tue, 15 Nov 2011 14:14:11 +0000 (06:14 -0800)]
Merge "Improve camera face detection javadoc." into ics-mr1
Michael Jurka [Tue, 15 Nov 2011 07:55:12 +0000 (23:55 -0800)]
am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
4b7494e07a44c0aa363379be463de70455a895f3':
Updating recent apps visuals on tablet
Michael Jurka [Tue, 15 Nov 2011 07:53:34 +0000 (23:53 -0800)]
Merge "Updating recent apps visuals on tablet" into ics-mr1
Jeff Sharkey [Tue, 15 Nov 2011 07:39:46 +0000 (23:39 -0800)]
am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
d968670d8369e5d92ba9b7a45b3804d692a05a4e':
Conservatively trim data usage stats.
Jeff Sharkey [Tue, 15 Nov 2011 07:37:17 +0000 (23:37 -0800)]
Merge "Conservatively trim data usage stats." into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 04:16:07 +0000 (20:16 -0800)]
am
b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
* commit '
b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e':
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
Nick Pelly [Tue, 15 Nov 2011 04:14:11 +0000 (20:14 -0800)]
Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
Adam Powell [Tue, 15 Nov 2011 03:49:39 +0000 (19:49 -0800)]
am
539bcca9: Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
* commit '
539bcca99d00166303245cd8137f49f29ff3f08e':
Fix bug
5594320 - Overlay action bar decor layout causes two measure passes
Adam Powell [Tue, 15 Nov 2011 03:47:55 +0000 (19:47 -0800)]
Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 03:40:46 +0000 (19:40 -0800)]
am
a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit '
a26cf3011157eb94fa2766e76fa0096628c16c18':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Nick Pelly [Tue, 15 Nov 2011 03:39:09 +0000 (19:39 -0800)]
Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
Mathias Agopian [Tue, 15 Nov 2011 03:17:37 +0000 (19:17 -0800)]
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
this flag should be enabled for all targets, but currently
some have issues with it, so we're turning it on only for
tested targets.
this will hopefully resolve some performance issues.
Bug:
5553562
Change-Id: I939992b4cd0debea980dec0127c72be2dff33af8
Mathias Agopian [Mon, 14 Nov 2011 07:52:47 +0000 (23:52 -0800)]
rework a bit how we manage EGL extensions
- don't advertise extensions that are not supported
by any implementation
- remove EGL_ANDROID_swap_rectangle which is not
implemented by anybody and confuses people
- add some comments about mandatory extensions
Bug:
5428001
Change-Id: Id8dc48116ac1d1eb79ec9ef55d03e29d4257c1f3
Dianne Hackborn [Tue, 15 Nov 2011 02:40:13 +0000 (18:40 -0800)]
am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 02:37:47 +0000 (18:37 -0800)]
am
9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1
* commit '
9058435dc1a741030c042c4d6f2512f5d1605e5d':
Fix races when content providers are acquired and released.
Dianne Hackborn [Tue, 15 Nov 2011 02:37:46 +0000 (18:37 -0800)]
am
f10a5364: Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
* commit '
f10a53646044da31e73f5393d929c603871d4a28':
Maybe fix issue #
5405788: Device continuously opening and closing...
Dianne Hackborn [Tue, 15 Nov 2011 02:36:50 +0000 (18:36 -0800)]
Merge "Improve low memory reporting." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 02:35:57 +0000 (18:35 -0800)]
Merge "Fix races when content providers are acquired and released." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:35:46 +0000 (18:35 -0800)]
Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
Daisuke Miyakawa [Tue, 15 Nov 2011 01:56:47 +0000 (17:56 -0800)]
am
d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit '
d8f5e6badb0dc11055508b83f20e48c82a7058bd':
Allow ContactsProvider to remove dulicates
Daisuke Miyakawa [Tue, 15 Nov 2011 01:54:17 +0000 (17:54 -0800)]
Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
Jamie Gennis [Tue, 15 Nov 2011 01:41:20 +0000 (17:41 -0800)]
am
6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
* commit '
6b228af6ff20b3f592db4ad5662e1bc401d09b4d':
EGL: add the ANDROID suffix to the blob cache ext