Dianne Hackborn
94765462e8
am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
...
* commit '91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
Improve low memory reporting.
2011-11-14 18:40:13 -08:00
Jeff Brown
d51c64e0b7
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.
2011-11-14 18:37:47 -08:00
Dianne Hackborn
f696eedf8e
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...
2011-11-14 18:37:46 -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
b65ed93ec9
am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
...
* commit 'd8f5e6badb0dc11055508b83f20e48c82a7058bd':
Allow ContactsProvider to remove dulicates
2011-11-14 17:56:47 -08:00
Daisuke Miyakawa
8e71118641
Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
2011-11-14 17:54:17 -08:00
Jamie Gennis
57918ba883
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
2011-11-14 17:41:20 -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
Jim Miller
4cc7ceea88
am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
...
* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
Fix 5579440: Add transport control view to tablet unlock screens
2011-11-14 16:16:28 -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
Tsu Chiang Chuang
0fccb0ad90
am 6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1
...
* commit '6a54a997e3dc71c5b9c5a1c7829bc3eb35404e92':
Adding mobile microbenchmark tests.
2011-11-14 14:38:31 -08:00
Adam Cohen
368df1fc1f
am 6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)" into ics-mr1
...
* commit '6066a2b4de36549b7d8fe36507b7254e501f0b28':
Fix uncaught exception in WindowManager#setWallpaperOffsets (issue 5613241)
2011-11-14 14:35:57 -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
153ede4231
am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
...
* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
Fix 5607938 AudioFocusDeathHandler leaks GREF
2011-11-14 12:33:20 -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
0d989f256a
am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
...
* commit '9d66da8ae61a8520f46ee7df3cbb374852d9da91':
Revert "Discard framebuffer rendering queues when discarding layers"
2011-11-14 12:27:34 -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
33ccc4353f
am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
...
* commit '72a31ab98f8687aa48fce028d54e79929780a302':
[maguro] Fix STK issues
2011-11-14 12:11:35 -08:00
John Wang
82e11a5992
Merge "[maguro] Fix STK issues" into ics-mr1
2011-11-14 12:10:16 -08:00
Mathias Agopian
9eb4fc62ee
am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
...
* commit 'c93a151fde7d616c22b86ae458b3d015e3820d5e':
Define, document, and test the behavior of very large SurfaceTextures
2011-11-14 11:51:48 -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
ca8b5f60de
am cde433c5: 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
...
* commit 'cde433c5f75fd4ac2ab31e9fc34654750d1e83f8':
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.
2011-11-14 10:37:21 -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
f661c97f4c
am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
...
* commit '030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
2011-11-14 08:39:33 -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
c6443d952c
am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817 " into ics-mr1
...
* commit '2858749704ea7b130499cf2ac7b3e1c3331f1582':
Discard framebuffer rendering queues when discarding layers Bug #5581817
2011-11-14 07:46:03 -08:00
Scott Main
d150c70816
am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
...
* commit '2af9f21c664d4579b5f51283a320a7d1fba13a75':
2011-11-14 07:46:03 -08:00
Jeff Brown
d2fada6e37
am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
...
* commit '6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
2011-11-14 07:46:02 -08:00
Adam Powell
6cc3f244a6
am 771d0c99: 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 '771d0c99f6433c3ad7063cdfa847c9476ef0453c':
2011-11-14 07:46:01 -08:00
Robert Ly
52f9cce6c5
am 632f072b: am 5f8b7269: docs: fix typo
...
* commit '632f072b223f5f682f4152551a61cec2456b2186':
2011-11-14 07:46:01 -08:00
Robert Ly
7bd19bd649
am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
...
* commit '83c16e2577705b577d2c74d45b0e55a50a0806e2':
2011-11-14 07:46:00 -08:00
Adam Powell
df6e917b18
am a8743f15: Fix bug 5425280 - Two ActionBar icons show up
...
* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
Fix bug 5425280 - Two ActionBar icons show up
2011-11-14 07:46:00 -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
Scott Main
6d0fe54d02
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 20:34:51 -08:00
Jeff Brown
32e3c31f6a
am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
...
* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
2011-11-11 20:34:48 -08:00
Adam Powell
65490cfba3
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 20:34:45 -08:00
Robert Ly
6a3b775142
am 5f8b7269: docs: fix typo
...
* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df':
docs: fix typo
2011-11-11 20:34:43 -08:00
Robert Ly
8fd2927049
am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
...
* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
2011-11-11 20:34:39 -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
87ecdfe640
am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
...
* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
XML parsing optimizations
2011-11-11 16:21:28 -08:00
Christopher Tate
e61bd662d9
Merge "XML parsing optimizations" into ics-mr1
2011-11-11 16:19:29 -08:00