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
Andreas Huber
bd667dd719
Merge "Didn't mean to check this in..." into ics-mr1
2011-11-11 10:46:02 -08:00
Eric Laurent
3c1afaaf79
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
2011-11-11 08:17:22 -08:00
Andreas Huber
849c30071d
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
2011-11-11 07:39:25 -08:00
Andreas Huber
2373ecfc11
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
2011-11-11 07:39:18 -08:00
Andreas Huber
6d7a5bddb1
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
2011-11-11 07:39:11 -08:00
James Dong
714fb46074
Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
2011-11-11 01:44:06 -08:00
Svetoslav Ganov
aefd78ef93
am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
...
* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
PopupWindow dismiss() can get into a recursive loop.
2011-11-11 08:02:27 +00:00
Chet Haase
131f20c4cf
am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
...
* commit '30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
DO NOT MERGE. Fix leak in LayoutTransition
2011-11-11 08:02:27 +00:00
Jamie Gennis
255d499dec
am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
2011-11-11 08:02:26 +00:00
Svetoslav Ganov
3e3f24f8e3
Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
2011-11-11 00:00:02 -08:00
Jeff Sharkey
a162bb66c6
Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
2011-11-10 20:31:03 -08:00
Daniel Sandler
1e89f681d1
Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
2011-11-10 20:16:47 -08:00
Daniel Sandler
d8423837ea
Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
2011-11-10 20:16:38 -08:00
Adam Powell
e50cb437f5
Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1
2011-11-10 19:56:03 -08:00
Adam Cohen
f9f56a90aa
Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1
2011-11-10 19:27:58 -08:00
John Reck
4a5f7a4de3
Merge "Fix lastVisible/global rects" into ics-mr1
2011-11-10 17:58:27 -08:00
Martijn Coenen
e87dd1ae87
Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
2011-11-10 17:40:20 -08:00
Chet Haase
5fc70b4d6d
Merge "Fix leak in LayoutTransition" into ics-mr1
2011-11-10 17:33:31 -08:00
Robert Greenwalt
ed91a59dbe
Merge "Fix Wimax-less build." into ics-mr1
2011-11-10 17:22:14 -08:00
Romain Guy
c58b9999e1
Merge "Terminate EGL when an app goes in the background" into ics-mr1
2011-11-10 17:10:41 -08:00