Jeff Brown
032458cbab
Merge "Eliminate hw.keyboards system properties." into ics-mr1
2011-11-15 19:17:09 -08:00
The Android Automerger
98dcfe2647
merge in ics-mr0-release history after reset to ics-mr0
2011-11-15 19:08:44 -08:00
Dianne Hackborn
f81caa67c0
Merge "Whoops, need to acquire lock." into ics-mr1
2011-11-15 19:04:11 -08:00
Jean-Michel Trivi
74266e51cf
Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1
2011-11-15 18:19:34 -08:00
Mathias Agopian
7288f91445
Merge "rework a bit how we manage EGL extensions" into ics-mr1
2011-11-15 18:12:00 -08:00
Jeff Brown
882b0a59d8
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
2011-11-15 18:00:10 -08:00
Jim Miller
403f92d906
Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1
2011-11-15 15:42:20 -08:00
Tsu Chiang Chuang
6a6ff2015d
am d5897dc7: fix for build breakage.
...
* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
fix for build breakage.
2011-11-15 15:00:26 -08:00
Jim Miller
f8d578c485
Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
2011-11-15 14:51:50 -08:00
Jeff Brown
fec867c117
Merge "Override app requested orientation when docked." into ics-mr1
2011-11-15 14:46:17 -08:00
Dianne Hackborn
6410350bc5
Merge "Improve low memory dropbox reporting." into ics-mr1
2011-11-15 14:39:37 -08:00
Jake Hamby
cf56976015
Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
2011-11-15 13:34:58 -08:00
Mathias Agopian
580a586150
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
2011-11-15 13:03:47 -08:00
Mathias Agopian
233c639ab8
Merge "fix crash when validating an invalid EGL objects" into ics-mr1
2011-11-15 13:03:22 -08:00
Winson Chung
1dc1b96dc5
Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1
2011-11-15 12:41:56 -08:00
Danielle Millett
4a22c4e3fa
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
2011-11-15 12:16:59 -08:00
Eric Fischer
7ec7256cd7
am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '8d00c194c228e67851e5a0cb75c4bf4d99dd40f0':
Import revised translations. DO NOT MERGE
2011-11-15 11:51:38 -08:00
Sunita Nadampalli
a929748ddb
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>
2011-11-15 11:43:35 -08:00
Jamie Gennis
9c6c6992e0
GLES: add image external enums
...
This change adds Java definitions for the enums of the
GL_OES_EGL_image_external OpenGL ES extension.
Bug: 3482193
Change-Id: Ib50326f8be9b9cc9021753855c3846ddcdc5eaa2
2011-11-15 11:35:46 -08:00
Tsu Chiang Chuang
164e08265a
am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0
...
* commit '047c4de2c548960fff428a92099003593cede5f8':
Adding mobile microbenchmark tests.
2011-11-15 11:10:44 -08:00
Bill Gruber
e90c25ec4e
Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
2011-11-15 10:57:32 -08:00
Adrian Ludwig
1aee13e0e4
Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
2011-11-15 10:37:28 -08:00
Gilles Debunne
6f7ea17504
Merge "Clean-up in TextView" into ics-mr1
2011-11-15 09:59:45 -08:00
John Reck
8aad25a355
Merge "Call onScrollChanged when scrolling layers" into ics-mr1
2011-11-15 09:56:17 -08:00
Hong Teng
501fc74035
Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
2011-11-15 09:42:37 -08:00
Daniel Sandler
5ee4306964
Merge "Bring back the 'more notifications' icon." into ics-mr1
2011-11-15 09:20:56 -08:00
Jean-Michel Trivi
f2e6bb27d5
Merge "Fix 5615747 Don't leak remote control client death handlers" into ics-mr1
2011-11-15 08:56:55 -08:00
Wu-cheng Li
434213525a
Merge "Improve camera face detection javadoc." into ics-mr1
2011-11-15 06:14:11 -08:00
Michael Jurka
a27d66819a
Merge "Updating recent apps visuals on tablet" into ics-mr1
2011-11-14 23:53:34 -08:00
Jeff Sharkey
d6a4be01a1
Merge "Conservatively trim data usage stats." into ics-mr1
2011-11-14 23:37:17 -08:00
Nick Pelly
f8255d8f6c
Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
2011-11-14 20:14:11 -08:00
Adam Powell
a4a49056ab
Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
2011-11-14 19:47:55 -08:00
Nick Pelly
c6e725bf86
Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
2011-11-14 19:39:09 -08:00
Mathias Agopian
251ce852cc
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
2011-11-14 19:17:37 -08:00
Mathias Agopian
4b9511c161
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
2011-11-14 19:05:45 -08:00
Dianne Hackborn
987c8330af
Merge "Improve low memory reporting." into ics-mr1
2011-11-14 18:36:50 -08:00
Jeff Brown
4d38d2538e
Merge "Fix races when content providers are acquired and released." into ics-mr1
2011-11-14 18:35:57 -08:00
Dianne Hackborn
874f8ce777
Merge "Maybe fix issue #5405788 : Device continuously opening and closing..." into ics-mr1
2011-11-14 18:35:46 -08:00
Daisuke Miyakawa
8e71118641
Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
2011-11-14 17:54:17 -08:00
Mathias Agopian
f0480de374
fix crash when validating an invalid EGL objects
...
the code that validated EGL objects dereferenced the object
to access its EGLDisplay -- needed for validation (!).
This was wrong for two reasons, first we dereferenced the object
before validating it (potentially leading to a crash), secondly
we didn't validate that the object existed in the right EGLDisplay.
We now use the EGLDisplay passed by the user API.
Change-Id: I66f9e851d4f8507892a6b1fee3065f124c4e7138
2011-11-14 17:40:21 -08:00
Jamie Gennis
7cd230c508
Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
2011-11-14 17:36:46 -08:00
The Android Automerger
0012066e10
merge in ics-mr0-release history after reset to ics-mr0
2011-11-14 17:11:43 -08:00
Jim Miller
772deeafa3
Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
2011-11-14 16:14:07 -08:00
Danielle Millett
e37af76c12
Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
2011-11-14 15:08:05 -08:00
Eric Fischer
643bf2c9c2
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-14 15:06:30 -08:00
Tsu Chiang Chuang
90e2e54c10
Merge "Adding mobile microbenchmark tests." into ics-mr0
2011-11-14 15:03:17 -08:00
Tsu Chiang Chuang
4464cb95f8
Merge "Adding mobile microbenchmark tests." into ics-mr1
2011-11-14 14:35:42 -08:00
Adam Cohen
d81ebb4661
Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1
2011-11-14 14:33:06 -08:00
Jean-Michel Trivi
071313e671
Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
2011-11-14 12:31:10 -08:00
Dave Burke
2248017d03
Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
2011-11-14 12:25:53 -08:00