John Wang
e42adac546
am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
...
* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
[maguro] Fix STK issues
2011-11-14 12:14:09 -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
8c11963dda
am 738d8cae: am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
...
* commit '738d8cae2239d194429676f2889cfae3c8f7ba08':
Define, document, and test the behavior of very large SurfaceTextures
2011-11-14 11:54:38 -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
Glenn Kasten
7591efc111
Merge "Don't check return value of new for being == null"
2011-11-14 10:50:33 -08:00
Alex Sakhartchouk
91fa3b91b3
am f579bb92: 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 'f579bb92c2032cd27aef72a1654c006933b22bbd':
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:39:08 -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
e3b191cbe9
am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
...
* commit '25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
audioflinger: fix noise when skipping to next song
2011-11-14 08:41:40 -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
3ca026f63c
am a16ee939: am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817 " into ics-mr1
...
* commit 'a16ee9390e1fcea8ff7cbefd253659c37f2999a3':
Discard framebuffer rendering queues when discarding layers Bug #5581817
2011-11-14 07:49:07 -08:00
Scott Main
da9cff678d
am 807c07b5: am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
...
* commit '807c07b564564b6f5cf3711e4743de9c25a38175':
2011-11-14 07:49:06 -08:00
Jeff Brown
7ed8b8e53a
am ffa5d463: am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
...
* commit 'ffa5d463c36e2127ff10a03ee49f0677567c02c1':
2011-11-14 07:49:04 -08:00
Adam Powell
3fceff9934
am ec44bdaa: (-s ours) 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 'ec44bdaaadcceaae8ab6fe5c4bd17d59fc00d7e3':
2011-11-14 07:49:03 -08:00
Robert Ly
33c2d53b18
am 19aa78a4: am 632f072b: am 5f8b7269: docs: fix typo
...
* commit '19aa78a40316b31531c57f1bf222e0bf2d1b5673':
2011-11-14 07:49:01 -08:00
Robert Ly
6d949beb92
am fafda521: am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
...
* commit 'fafda5210f54705fdf36baeee0064d46e6e1994e':
2011-11-14 07:49:00 -08:00
Adam Powell
8327c0cf8d
am b22eec57: am a8743f15: Fix bug 5425280 - Two ActionBar icons show up
...
* commit 'b22eec57d559fc9dd5663abdc37d6b6e6a4f641f':
Fix bug 5425280 - Two ActionBar icons show up
2011-11-14 07:48:58 -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
Kristian Monsen
cf96735f54
Merge "Removing the ability to get native instrumentation as part of nav dump"
2011-11-14 04:28:32 -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
8a566dc98f
am 30870e32: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
...
* commit '30870e32de4d7338d0aa957458ec63df9806f9da':
Docs: update state list drawable with state_activated and revise selected/focused
2011-11-11 20:37:14 -08:00
Jeff Brown
4678097aeb
am 0e4669c8: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
...
* commit '0e4669c81009cea51d9d7b42b7ff665f44e78aa6':
Fix bug in TextLayoutCacheKey handling embedded nulls.
2011-11-11 20:37:12 -08:00
Adam Powell
01c727f625
am 811959f4: (-s ours) 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 '811959f474f1b39b655935aa0ad3ab70125c992c':
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:37:10 -08:00
Robert Ly
fc76c1fbc8
am 2dd19b44: am 5f8b7269: docs: fix typo
...
* commit '2dd19b4456450706d78f409b526cb6a9979a5f33':
docs: fix typo
2011-11-11 20:37:08 -08:00
Robert Ly
1ec9161088
am 6be50a40: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
...
* commit '6be50a40549a16a3aa3fc1d4360483ab3e898501':
docs: ndk r7 rel notes
2011-11-11 20:37:06 -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
Fabrice Di Meglio
22d02faaf8
Merge "Improve the logging in TextLayoutCache."
2011-11-11 16:58:10 -08:00
Svetoslav Ganov
62578b7040
Merge "Added missing comments in Instrumentation#sendStringSync"
2011-11-11 16:52:37 -08:00
Svetoslav Ganov
b21fa702b8
Merge "Instrumentation sendStringSync(String) may try to inject obsolete events."
2011-11-11 16:46:07 -08:00
Christopher Tate
3ef48052fb
am 0fbd9eba: am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
...
* commit '0fbd9ebab891530290b4d52fd5e81f6b4d7278d8':
XML parsing optimizations
2011-11-11 16:24:19 -08:00