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
John Wang
82e11a5992
Merge "[maguro] Fix STK issues" into ics-mr1
2011-11-14 12:10:16 -08:00
Mathias Agopian
c17c19e405
Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
2011-11-14 11:49:42 -08:00
Alex Sakhartchouk
a38658ffae
Merge "Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
2011-11-14 10:35:08 -08:00
Eric Laurent
9f95f9bee4
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
2011-11-14 08:38:05 -08:00
Mathias Agopian
203ad02a17
Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817 " into ics-mr1
2011-11-14 00:52:09 -08:00
The Android Automerger
74604cc7ff
merge in ics-mr0-release history after reset to ics-mr0
2011-11-13 06:28:23 -08:00
Scott Main
385af2d3a5
am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
...
* commit '19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
Docs: update state list drawable with state_activated and revise selected/focused
2011-11-11 19:22:07 -08:00
Jeff Brown
0c30e0b567
am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
...
* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
2011-11-11 19:22:04 -08:00
Adam Powell
def8405871
am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
...
* commit '6200a4b7eb07507055af93ec1a054640a39b9751':
DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
2011-11-11 19:22:02 -08:00
Robert Ly
ff19d4118a
am 5f8b7269: docs: fix typo
...
* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df':
docs: fix typo
2011-11-11 19:22:01 -08:00
Robert Ly
cb7b6ad0a5
am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
...
* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
2011-11-11 19:17:23 -08:00
Mathias Agopian
194c76c047
Define, document, and test the behavior of very large SurfaceTextures
...
updateTexImage() now throws a runtime exception when its native
counterpart fails
Bug: 5506633
Change-Id: I151a6f685d465966e7df4df624412ab2da62e95f
2011-11-11 18:44:35 -08:00
Scott Main
16d152ce1d
Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
2011-11-11 17:17:23 -08:00
Christopher Tate
e61bd662d9
Merge "XML parsing optimizations" into ics-mr1
2011-11-11 16:19:29 -08:00
Adam Powell
eade6e88c7
Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances." into ics-mr0
2011-11-11 14:54:02 -08:00
The Android Automerger
0364cec4ba
merge in ics-mr0-release history after reset to ics-mr0
2011-11-11 14:46:55 -08:00
Robert Greenwalt
8e86aeceb3
Merge "Tone down Tethering logs." into ics-mr1
2011-11-11 14:37:18 -08:00
Dianne Hackborn
b68fde0806
Merge "Fix issue #5595933 : GREF leak due to race condition in..." into ics-mr1
2011-11-11 14:24:58 -08:00
Christopher Tate
f01724f46a
Merge "Localized optimizations in views and bitmaps" into ics-mr1
2011-11-11 14:24:53 -08:00
Jamie Gennis
c42fcf05ce
EGL: add the ANDROID suffix to the blob cache ext
...
This change adds the ANDROID suffix to the all the types and functions
defined by the EGL_ANDROID_blob_cache extension.
Change-Id: I087875b96d9a7053efb9c8d5614f9f765eed799d
2011-11-11 13:17:03 -08:00
Nick Pelly
cce3281f62
Merge "Changes for access control." into ics-mr1
2011-11-11 13:06:44 -08:00
Matthew Xie
aa3a932ce8
Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
2011-11-11 12:16:41 -08:00
Robert Ly
dba3ec9351
Merge "docs: ndk r7 rel notes" into ics-mr0
2011-11-11 12:06:39 -08:00
Peter Ng
aabb10eb68
Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
2011-11-11 11:57:41 -08:00
Dianne Hackborn
b7afe325b4
Merge "Fix issue #5522658 : Menu button shown on lock screen if app underneath requests it" into ics-mr1
2011-11-11 11:36:14 -08:00
James Dong
f6de140cb9
Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
2011-11-11 10:49:24 -08:00