OSDN Git Service
John Wang [Mon, 14 Nov 2011 20:14:09 +0000 (12:14 -0800)]
am
6504d74b: am
72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '
6504d74b8f7b98f7c2d5fb550042c644510d5f34':
[maguro] Fix STK issues
John Wang [Mon, 14 Nov 2011 20:11:35 +0000 (12:11 -0800)]
am
72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '
72a31ab98f8687aa48fce028d54e79929780a302':
[maguro] Fix STK issues
John Wang [Mon, 14 Nov 2011 20:10:16 +0000 (12:10 -0800)]
Merge "[maguro] Fix STK issues" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 19:54:38 +0000 (11:54 -0800)]
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
Mathias Agopian [Mon, 14 Nov 2011 19:51:48 +0000 (11:51 -0800)]
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
Mathias Agopian [Mon, 14 Nov 2011 19:49:42 +0000 (11:49 -0800)]
Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
Glenn Kasten [Mon, 14 Nov 2011 18:50:33 +0000 (10:50 -0800)]
Merge "Don't check return value of new for being == null"
dujin.cha [Sat, 12 Nov 2011 08:50:26 +0000 (17:50 +0900)]
[maguro] Fix STK issues
1. Fix Bug
5574160 (Abnormal Setup menu)
2. Fix Bug
5558273 (GetInkey issue)
3. Fix BUg
5558612 (No default alpha id)
4. Fix Vodafone UK ALS issue.
Bug :
5574160,
5558273,
5558612
Change-Id: Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
Alex Sakhartchouk [Mon, 14 Nov 2011 18:39:08 +0000 (10:39 -0800)]
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.
Alex Sakhartchouk [Mon, 14 Nov 2011 18:37:21 +0000 (10:37 -0800)]
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.
Alex Sakhartchouk [Mon, 14 Nov 2011 18:35:08 +0000 (10:35 -0800)]
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
Eric Laurent [Mon, 14 Nov 2011 16:41:40 +0000 (08:41 -0800)]
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
Eric Laurent [Mon, 14 Nov 2011 16:39:33 +0000 (08:39 -0800)]
am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 15:49:07 +0000 (07:49 -0800)]
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
Scott Main [Mon, 14 Nov 2011 15:49:06 +0000 (07:49 -0800)]
am
807c07b5: am
2af9f21c: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
807c07b564564b6f5cf3711e4743de9c25a38175':
Jeff Brown [Mon, 14 Nov 2011 15:49:04 +0000 (07:49 -0800)]
am
ffa5d463: am
6f0464e7: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
ffa5d463c36e2127ff10a03ee49f0677567c02c1':
Adam Powell [Mon, 14 Nov 2011 15:49:03 +0000 (07:49 -0800)]
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':
Robert Ly [Mon, 14 Nov 2011 15:49:01 +0000 (07:49 -0800)]
Robert Ly [Mon, 14 Nov 2011 15:49:00 +0000 (07:49 -0800)]
am
fafda521: am
83c16e25: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
fafda5210f54705fdf36baeee0064d46e6e1994e':
Adam Powell [Mon, 14 Nov 2011 15:48:58 +0000 (07:48 -0800)]
am
b22eec57: am
a8743f15: Fix bug
5425280 - Two ActionBar icons show up
* commit '
b22eec57d559fc9dd5663abdc37d6b6e6a4f641f':
Fix bug
5425280 - Two ActionBar icons show up
Mathias Agopian [Mon, 14 Nov 2011 15:46:03 +0000 (07:46 -0800)]
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
Scott Main [Mon, 14 Nov 2011 15:46:03 +0000 (07:46 -0800)]
am
2af9f21c: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
2af9f21c664d4579b5f51283a320a7d1fba13a75':
Jeff Brown [Mon, 14 Nov 2011 15:46:02 +0000 (07:46 -0800)]
am
6f0464e7: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
Adam Powell [Mon, 14 Nov 2011 15:46:01 +0000 (07:46 -0800)]
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':
Robert Ly [Mon, 14 Nov 2011 15:46:01 +0000 (07:46 -0800)]
Robert Ly [Mon, 14 Nov 2011 15:46:00 +0000 (07:46 -0800)]
am
83c16e25: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
83c16e2577705b577d2c74d45b0e55a50a0806e2':
Adam Powell [Mon, 14 Nov 2011 15:46:00 +0000 (07:46 -0800)]
am
a8743f15: Fix bug
5425280 - Two ActionBar icons show up
* commit '
a8743f152aac4a8ef97c79bdad5232614453ce2a':
Fix bug
5425280 - Two ActionBar icons show up
Kristian Monsen [Mon, 14 Nov 2011 15:27:44 +0000 (15:27 +0000)]
Fix build
Change-Id: I8198f7a8470e7c9500ab2f6512162bbb55ea6ee7
Kristian Monsen [Mon, 14 Nov 2011 12:28:32 +0000 (04:28 -0800)]
Merge "Removing the ability to get native instrumentation as part of nav dump"
Mathias Agopian [Mon, 14 Nov 2011 08:52:09 +0000 (00:52 -0800)]
Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
Scott Main [Sat, 12 Nov 2011 04:37:14 +0000 (20:37 -0800)]
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
Jeff Brown [Sat, 12 Nov 2011 04:37:12 +0000 (20:37 -0800)]
am
0e4669c8: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
0e4669c81009cea51d9d7b42b7ff665f44e78aa6':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 04:37:10 +0000 (20:37 -0800)]
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.
Robert Ly [Sat, 12 Nov 2011 04:37:08 +0000 (20:37 -0800)]
Robert Ly [Sat, 12 Nov 2011 04:37:06 +0000 (20:37 -0800)]
am
6be50a40: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
6be50a40549a16a3aa3fc1d4360483ab3e898501':
docs: ndk r7 rel notes
Scott Main [Sat, 12 Nov 2011 04:34:51 +0000 (20:34 -0800)]
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
Jeff Brown [Sat, 12 Nov 2011 04:34:48 +0000 (20:34 -0800)]
am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 04:34:45 +0000 (20:34 -0800)]
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.
Robert Ly [Sat, 12 Nov 2011 04:34:43 +0000 (20:34 -0800)]
Robert Ly [Sat, 12 Nov 2011 04:34:39 +0000 (20:34 -0800)]
am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
Scott Main [Sat, 12 Nov 2011 03:22:07 +0000 (19:22 -0800)]
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
Jeff Brown [Sat, 12 Nov 2011 03:22:04 +0000 (19:22 -0800)]
am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 03:22:02 +0000 (19:22 -0800)]
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.
Robert Ly [Sat, 12 Nov 2011 03:22:01 +0000 (19:22 -0800)]
Robert Ly [Sat, 12 Nov 2011 03:17:23 +0000 (19:17 -0800)]
am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
Mathias Agopian [Thu, 10 Nov 2011 22:34:26 +0000 (14:34 -0800)]
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
Adam Powell [Sat, 12 Nov 2011 02:35:53 +0000 (18:35 -0800)]
Fix bug
5425280 - Two ActionBar icons show up
Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
Scott Main [Sat, 12 Nov 2011 01:17:23 +0000 (17:17 -0800)]
Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
Fabrice Di Meglio [Sat, 12 Nov 2011 00:58:10 +0000 (16:58 -0800)]
Merge "Improve the logging in TextLayoutCache."
Svetoslav Ganov [Sat, 12 Nov 2011 00:52:37 +0000 (16:52 -0800)]
Merge "Added missing comments in Instrumentation#sendStringSync"
Svetoslav Ganov [Sat, 12 Nov 2011 00:50:21 +0000 (16:50 -0800)]
Added missing comments in Instrumentation#sendStringSync
Change-Id: Ib20c5f9763c4ff97dec02fbb79721da93e964bc7
Svetoslav Ganov [Sat, 12 Nov 2011 00:46:07 +0000 (16:46 -0800)]
Merge "Instrumentation sendStringSync(String) may try to inject obsolete events."
Eric Laurent [Fri, 11 Nov 2011 23:42:52 +0000 (15:42 -0800)]
audioflinger: fix noise when skipping to next song
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.
This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.
Added a delay before stopping effect process after all tracks have been removed from a session.
Issue
5584880.
Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
Christopher Tate [Sat, 12 Nov 2011 00:24:19 +0000 (16:24 -0800)]
am
0fbd9eba: am
c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit '
0fbd9ebab891530290b4d52fd5e81f6b4d7278d8':
XML parsing optimizations
Christopher Tate [Sat, 12 Nov 2011 00:21:28 +0000 (16:21 -0800)]
am
c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit '
c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
XML parsing optimizations
Christopher Tate [Sat, 12 Nov 2011 00:19:29 +0000 (16:19 -0800)]
Merge "XML parsing optimizations" into ics-mr1
Dianne Hackborn [Sat, 12 Nov 2011 00:16:31 +0000 (16:16 -0800)]
am
7ddf38a5: am
be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '
7ddf38a5bf833f90057b0795dd9af6c61d3cf2d5':
Make activity manager more robust in the face of app activity leaks.
Dianne Hackborn [Sat, 12 Nov 2011 00:13:46 +0000 (16:13 -0800)]
am
be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '
be70785f9b2dbd2c52fd8676d99bc64b22784201':
Make activity manager more robust in the face of app activity leaks.
Christopher Tate [Fri, 11 Nov 2011 23:47:21 +0000 (15:47 -0800)]
XML parsing optimizations
Traceview showed approximately 10% of total parse time inside the
synthetic 'trampoline' methods generated to provide inner classes
with access to their outer class's private fields. The bottleneck
in this particular case is in XmlBlock and its inner class Parser.
Making the bottlneck outer-class members and methods package-scope
instead of private removes that 10% overhead being spent within
these access trampolines.
Traceview tends to overemphasize the significance of very small
methods such as these trampolines. That said, the measured speed
gain on the ParseLargeXmlResFg op due to this patch is between
5% and 6%.
Change-Id: Ia0e3ae5408d1f9992b46e6e30dd2407090379b07
Jeff Brown [Fri, 11 Nov 2011 23:14:56 +0000 (15:14 -0800)]
Improve the logging in TextLayoutCache.
Also deleted some dead code.
Change-Id: I1feb5744177ae751ff1417f49f3c45139a35246b
Jeff Brown [Fri, 11 Nov 2011 23:03:05 +0000 (15:03 -0800)]
Fix bug in TextLayoutCacheKey handling embedded nulls.
We were not passing the length of the UTF-16 string to
String16::setTo. As a result, it was copying the contents of
the text up to the first null it found.
First problem, these strings are not typically null terminated!
Second problem, if the string contained a null character, then
we might truncate it. However, we only truncated the string
when the copy constructor was invoked (say, when we called
get() on the cache) but not in internalTextCopy() (before
adding the key to the cache).
As a result of the second problem, we would first search
the cache for a key that matched a partially copied truncated
string (potentially reading uninitialized memory that followed it).
Finding none, we would add the entry to the cache using
the correct key.
If the cache already had a value associated with the correct key,
then the put would fail, returning false. Charging ever onwards,
we would add the size of the entry to the cache size.
Proceeding in this manner, it was possible for the cache to
believe it had less remaining space than it really did. At that
point, it was possible for the cache to evict all entries and
yet still not think it had room to add a new one, so it would
continue trying to make space indefinitely.
Bug:
5576812
Change-Id: I05251594f6b2da0a5dc09f7200f04fe9100ec766
Jeff Brown [Fri, 11 Nov 2011 23:41:05 +0000 (15:41 -0800)]
Merge "Include the build fingerprint in bug reports."
Jeff Brown [Fri, 11 Nov 2011 23:30:45 +0000 (15:30 -0800)]
Merge "Seems to break text views all over. Particularly noticeable is that the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character."
Jeff Brown [Fri, 11 Nov 2011 23:30:16 +0000 (15:30 -0800)]
Seems to break text views all over. Particularly noticeable is that the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character.
Revert "Fix bug #
5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
This reverts commit
caa8c06de5f94db69faca35d666c04b82d3f420b
Dianne Hackborn [Fri, 11 Nov 2011 22:32:10 +0000 (14:32 -0800)]
Make activity manager more robust in the face of app activity leaks.
This came up from bug #
5601885: Memory increase (leak?) in system_server
Stingray MR1
This isn't *really* a leak in the system process -- it is a leak in an
application process that is causing the system process to keep around
a bunch of ActivityRecord objects longer than it should, until that app
process is ultimately killed.
Unfortunately these days leaking an ActivityRecord also often means
leaking a thumbnail, which is a big slab of memory.
So make the activity manager better about this, using a weak reference
from the handle the object has so we can still clean away most of the
state associated with the ActivityRecord even if the client side leaks
its own reference.
Change-Id: Idbab45e09749cdfb54899203da7981e7b3576e25
Jeff Brown [Fri, 11 Nov 2011 22:56:27 +0000 (14:56 -0800)]
Include the build fingerprint in bug reports.
We need the build fingerprint to decode the native stacks
that appear within the bug report.
Change-Id: Ia337addb5e4942c1ec7bcee3407b6a4f6b7e89ab
Adam Powell [Fri, 11 Nov 2011 22:54:02 +0000 (14:54 -0800)]
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
Robert Greenwalt [Fri, 11 Nov 2011 22:41:18 +0000 (14:41 -0800)]
am
3100e2b0: am
24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '
3100e2b01792e6868698e06ecf275f47f187d537':
Tone down Tethering logs.
Robert Greenwalt [Fri, 11 Nov 2011 22:38:34 +0000 (14:38 -0800)]
am
24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '
24597eb77e1a88994b83c5b1f45d5b72383943b8':
Tone down Tethering logs.
Robert Greenwalt [Fri, 11 Nov 2011 22:37:18 +0000 (14:37 -0800)]
Merge "Tone down Tethering logs." into ics-mr1
Dianne Hackborn [Fri, 11 Nov 2011 22:28:57 +0000 (14:28 -0800)]
am
0b554bab: am
d400d03f: Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
* commit '
0b554bab585fe2d7eaaca8692106e0cbbc3aabe4':
Fix issue #
5595933: GREF leak due to race condition in...
Christopher Tate [Fri, 11 Nov 2011 22:28:55 +0000 (14:28 -0800)]
am
9acae658: am
847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '
9acae658e179796beee91d673f9f70af49ae3c9b':
Localized optimizations in views and bitmaps
Dianne Hackborn [Fri, 11 Nov 2011 22:26:30 +0000 (14:26 -0800)]
am
d400d03f: Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
* commit '
d400d03f4a6384449f8b0d3c8a9aa7e1e8aa5a16':
Fix issue #
5595933: GREF leak due to race condition in...
Christopher Tate [Fri, 11 Nov 2011 22:26:28 +0000 (14:26 -0800)]
am
847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '
847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
Localized optimizations in views and bitmaps
Dianne Hackborn [Fri, 11 Nov 2011 22:24:58 +0000 (14:24 -0800)]
Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
Christopher Tate [Fri, 11 Nov 2011 22:24:53 +0000 (14:24 -0800)]
Merge "Localized optimizations in views and bitmaps" into ics-mr1
Robert Greenwalt [Fri, 11 Nov 2011 20:30:19 +0000 (12:30 -0800)]
Tone down Tethering logs.
bug:
5601582
Change-Id: I66c0a5a06a2c13a7cf93ea264d156b37df23745f
Nick Pelly [Fri, 11 Nov 2011 21:59:09 +0000 (13:59 -0800)]
am
4780228f: am
48b651cb: Merge "Changes for access control." into ics-mr1
* commit '
4780228fb2476304e29ddf9a118c460ac4eb96ee':
Changes for access control.
Matthew Xie [Fri, 11 Nov 2011 21:42:42 +0000 (13:42 -0800)]
am
5a8ad071: am
a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit '
5a8ad0717dad332cab4b2d9f7a6030b76cb8d6bb':
Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
Peter Ng [Fri, 11 Nov 2011 21:42:36 +0000 (13:42 -0800)]
am
b88cd4be: am
20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '
b88cd4bea3bd1dc3497b79e6da187ae0f858f266':
Making the quicksettings notifications icon the right opacity
Robert Ly [Fri, 11 Nov 2011 21:39:34 +0000 (13:39 -0800)]
docs: fix typo
Change-Id: I86ebd8bced2ca133fc6faff43c2e69205f0c9862
Nick Pelly [Fri, 11 Nov 2011 21:08:37 +0000 (13:08 -0800)]
am
48b651cb: Merge "Changes for access control." into ics-mr1
* commit '
48b651cb2a3afab979c2a46185fd7edfa5424387':
Changes for access control.
Nick Pelly [Fri, 11 Nov 2011 21:06:44 +0000 (13:06 -0800)]
Merge "Changes for access control." into ics-mr1
Christopher Tate [Fri, 11 Nov 2011 03:59:13 +0000 (19:59 -0800)]
Localized optimizations in views and bitmaps
* Don't call context.getResources() redundantly when unnecessary;
similarly for Resources.getCompatibilityInfo()
* During bitmap creation, don't bother clearing to 0: it's unnecessary
because now that the raw bits are stored in a VM-side byte array, it
was cleared at initialization time. Also, don't use the sanity-
checking public entry point to erase to a color, because we know
that we're by definition in a "legal" path to erase to the initial
contents and don't need to incur the overhead of the (inappropriate)
sanity checking.
Change-Id: Idaca4d64fdecefd5d51337646ead32e1db510e02
Dianne Hackborn [Fri, 11 Nov 2011 20:31:52 +0000 (12:31 -0800)]
Fix issue #
5595933: GREF leak due to race condition in...
...LoadedApk.ServiceDispatcher.connected , LoadedApk.forgetServiceDispatcher
Don't be stupid if we receive a new binding to a ServiceConnection after it
has already been unbound.
Change-Id: I85a49de97372bf9af55542a89031f0b7a2ac8fbb
Matthew Xie [Fri, 11 Nov 2011 20:18:22 +0000 (12:18 -0800)]
am
a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit '
a303f0ecfc5472d3b2e65cb7de9f7413a9a83d9a':
Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
Matthew Xie [Fri, 11 Nov 2011 20:16:41 +0000 (12:16 -0800)]
Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
Matthew Xie [Thu, 10 Nov 2011 08:03:28 +0000 (00:03 -0800)]
Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
Send CONNECT_OTHER_PROFILE to Device profile for low priority hfp and a2dp
incoming connect. In the case when HFP autoconnect is off but a2dp autoconnect
is on, if HF autoconnect to HFP, phone will reject HFP but connect a2dp.
Before this fix, phone reject HFP. A2dp will not get connected unless the HF do
media auto-connect, which most carkits do not do.
Also do similar change for incoming a2dp connection
bug
5091838
Change-Id: Ife1815f527bcd94e0d9ffc645028484fa9c49a43
Robert Ly [Fri, 11 Nov 2011 20:06:39 +0000 (12:06 -0800)]
Merge "docs: ndk r7 rel notes" into ics-mr0
Adam Powell [Fri, 28 Oct 2011 00:46:07 +0000 (17:46 -0700)]
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an
overflow menu under invalid circumstances.
Change-Id: Ifb847b914b880ffb21dd5fc6efa833f46466f224
Peter Ng [Fri, 11 Nov 2011 19:59:40 +0000 (11:59 -0800)]
am
20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '
20d8c5ed96d6fb81d14cbce5221025ed6c954d6e':
Making the quicksettings notifications icon the right opacity
Peter Ng [Fri, 11 Nov 2011 19:57:41 +0000 (11:57 -0800)]
Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
Dianne Hackborn [Fri, 11 Nov 2011 19:51:21 +0000 (11:51 -0800)]
am
8f45e3e2: am
be425cce: Merge "Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit '
8f45e3e280fa84494d5d45c73697645d20dea101':
Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it
James Dong [Fri, 11 Nov 2011 19:51:19 +0000 (11:51 -0800)]
am
9a176507: am
b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit '
9a176507a96ceb3640a56a5449e96fc3e406a765':
Unhide the key to retriever location information in 3gp/mp4 files
Andreas Huber [Fri, 11 Nov 2011 19:51:17 +0000 (11:51 -0800)]
am
8a065423: am
23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '
8a0654231ff36d938bc3451190cf67231195f1d0':
Didn't mean to check this in...
Robert Greenwalt [Fri, 11 Nov 2011 19:51:16 +0000 (11:51 -0800)]
am
2c41bce3: am
424781e2: Fix NPE in ConnectivityService.
* commit '
2c41bce3f2134159ce64d589ff1bb298b9939178':
Fix NPE in ConnectivityService.
Eric Laurent [Fri, 11 Nov 2011 19:51:14 +0000 (11:51 -0800)]
am
2c29a5cf: am
1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '
2c29a5cf1658532bca4e34f816fa30312241a336':
visualizer: reset buffer if playback is idle
Andreas Huber [Fri, 11 Nov 2011 19:51:12 +0000 (11:51 -0800)]
am
40461ee7: am
cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
* commit '
40461ee70161d8568663332f72be2353b04c34e7':
Instead of asserting, signal a runtime error if the session doesn't contain
Andreas Huber [Fri, 11 Nov 2011 19:51:11 +0000 (11:51 -0800)]
am
9a87a838: (-s ours) am
5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '
9a87a838028f3911a066a729cdb5ec688903a5ae':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets