OSDN Git Service
Jean-Michel Trivi [Mon, 14 Nov 2011 20:31:10 +0000 (12:31 -0800)]
Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
Dave Burke [Mon, 14 Nov 2011 20:25:53 +0000 (12:25 -0800)]
Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
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:49:42 +0000 (11:49 -0800)]
Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
Dave Burke [Mon, 14 Nov 2011 19:39:30 +0000 (11:39 -0800)]
Revert "Discard framebuffer rendering queues when discarding layers"
This reverts commit
da96f8ac2c1c35a54f3f36e6d776cb386a251d03.
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: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:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
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 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
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:19:29 +0000 (16:19 -0800)]
Merge "XML parsing optimizations" into ics-mr1
Jean-Michel Trivi [Sat, 12 Nov 2011 00:13:48 +0000 (16:13 -0800)]
Fix
5607938 AudioFocusDeathHandler leaks GREF
The AudioFocus death handler was correctly updating the audio
focus stack when an audio focus client dies, but the death handler
was leaking GREF if unlinkToDeath() is not called.
The fix consists in making sure unlinkToDeath() is always called
by calling it in its finalizer.
Change-Id: I0c5343b4986ab582cadbf171fc53816952dc16f5
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: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
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
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:37:18 +0000 (14:37 -0800)]
Merge "Tone down Tethering logs." into ics-mr1
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
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: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: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:57:41 +0000 (11:57 -0800)]
Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
Alex Sakhartchouk [Fri, 11 Nov 2011 19:49:45 +0000 (11:49 -0800)]
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.
Change-Id: I7a382a701efde3264e5cd9b9a9b428ade5eb4a9a
Dianne Hackborn [Fri, 11 Nov 2011 19:36:14 +0000 (11:36 -0800)]
Merge "Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
Scott Main [Fri, 11 Nov 2011 18:44:43 +0000 (10:44 -0800)]
Docs: update state list drawable with state_activated and revise selected/focused
Change-Id: I6bd919fc71a74fc8135ed333c93d187e0d9e9d80
James Dong [Fri, 11 Nov 2011 18:49:24 +0000 (10:49 -0800)]
Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 18:46:02 +0000 (10:46 -0800)]
Merge "Didn't mean to check this in..." into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 18:17:00 +0000 (10:17 -0800)]
Didn't mean to check this in...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
Robert Greenwalt [Fri, 11 Nov 2011 17:56:03 +0000 (09:56 -0800)]
Fix NPE in ConnectivityService.
If it's configured with a defined network but can't create a network state tracker
for it, it would NPE and restart the framework whenever a default network
disconnects.
bug:
5603268
Change-Id: I816c4f522d766e0353a713623f6635b03395b01e
Jeff Hamilton [Tue, 8 Nov 2011 22:55:13 +0000 (16:55 -0600)]
Changes for access control.
The package name is now required when using the
NFC extras APIs so the context is stored away
and used to derive the package name to be sent
to the NfcService.
Bug:
4515759
Change-Id: I1a3aba3fc026e0090a914b0686fc4b8dec25b927
Eric Laurent [Fri, 11 Nov 2011 16:17:22 +0000 (08:17 -0800)]
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:25 +0000 (07:39 -0800)]
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:18 +0000 (07:39 -0800)]
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:11 +0000 (07:39 -0800)]
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
Narayan Kamath [Wed, 9 Nov 2011 14:22:32 +0000 (14:22 +0000)]
Notifiy callers when a speech synthesis error occurs.
bug:
5589877
Change-Id: Ideca8966ea1caa6789b3273e388dd1f25c1e2758
James Dong [Thu, 10 Nov 2011 22:46:26 +0000 (14:46 -0800)]
Unhide the key to retriever location information in 3gp/mp4 files
Change-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130
related-to-bug:
5560253
James Dong [Fri, 11 Nov 2011 09:44:06 +0000 (01:44 -0800)]
Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
Svetoslav Ganov [Fri, 11 Nov 2011 08:02:27 +0000 (08:02 +0000)]
am
7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
* commit '
7b8bec280f20e8a5863d8214bbc195497335eba6':
PopupWindow dismiss() can get into a recursive loop.
Chet Haase [Fri, 11 Nov 2011 08:02:27 +0000 (08:02 +0000)]
am
30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
* commit '
30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
DO NOT MERGE. Fix leak in LayoutTransition
Jamie Gennis [Fri, 11 Nov 2011 08:02:26 +0000 (08:02 +0000)]
am
ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
* commit '
ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
Svetoslav Ganov [Fri, 11 Nov 2011 08:00:02 +0000 (00:00 -0800)]
Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
Jeff Sharkey [Fri, 11 Nov 2011 04:31:03 +0000 (20:31 -0800)]
Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
Daniel Sandler [Fri, 11 Nov 2011 04:16:47 +0000 (20:16 -0800)]
Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
Daniel Sandler [Fri, 11 Nov 2011 04:16:38 +0000 (20:16 -0800)]
Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
Adam Powell [Fri, 11 Nov 2011 03:56:03 +0000 (19:56 -0800)]
Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1
Adam Powell [Fri, 11 Nov 2011 03:48:23 +0000 (19:48 -0800)]
Make the overridden ImageView#setVisibility remotable
Change-Id: Idaf061ea8c2a06ec8abaf74cf865446d9092afa2
Dianne Hackborn [Fri, 11 Nov 2011 03:38:40 +0000 (19:38 -0800)]
Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it
Drive the menu button off of the currently focused window. That is, after all,
the one that is going to receive the menu key event.
Change-Id: I61cac1e274602e5ea53402ab15bd63a9cd89e9cd
Adam Cohen [Fri, 11 Nov 2011 03:27:58 +0000 (19:27 -0800)]
Merge "Deferring wallpaper update to improve workspace scrolling (issue
5506959)" into ics-mr1
Romain Guy [Fri, 11 Nov 2011 03:23:58 +0000 (19:23 -0800)]
Discard framebuffer rendering queues when discarding layers
Bug #
5581817
Change-Id: If612846ec5f7793710fc4df152791fb32c506551
John Reck [Fri, 11 Nov 2011 01:58:27 +0000 (17:58 -0800)]
Merge "Fix lastVisible/global rects" into ics-mr1
Jeff Sharkey [Fri, 11 Nov 2011 01:54:23 +0000 (17:54 -0800)]
Clamp non-monotonic stats instead of dropping.
When encountering non-monotonic stats rows, recover remaining data by
clamping to 0. In particular, this avoids edge-case where persisting
threshold checks would never trigger. Also recover when tethering
snapshots are missing.
Bug:
5600785,
5433871,
5600678
Change-Id: I1871954ce3955cc4ac8846f9841bae0066176ffe
Chet Haase [Fri, 11 Nov 2011 01:03:12 +0000 (17:03 -0800)]
DO NOT MERGE. Fix leak in LayoutTransition
LayoutTransition was making an incorrect assumption that there could
only be one transition animation on a child of a transitioning container.
But if multiple children are added/removed to/from that container, there would
be multiple calls to set up changing animations for each existing child
of that container. This meant that the child would have multiple, new
OnLayoutChangeListeners added to it as part of the setup process.
Meanwhile, we would cache only the latest listener in a hashmap that used
the child as a key for the listener. Then when we cleaned up the hashmap later,
we would remove only the latest listener from the child, leaving the rest there
for eternity.
The fix is to skip the setup entirely for children that already have listeners
set on them; they must, if that's the case, already have been set up and are
already listening for layout changes. Setting up the animation is redundant,
and adding another listener is a leak.
issue #
5588509: memory leak in systemui
Change-Id: Ie2192593d84702be7243c18760dfdb3a027b761c
Martijn Coenen [Fri, 11 Nov 2011 01:40:20 +0000 (17:40 -0800)]
Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
Chet Haase [Fri, 11 Nov 2011 01:33:31 +0000 (17:33 -0800)]
Merge "Fix leak in LayoutTransition" into ics-mr1
John Reck [Fri, 11 Nov 2011 01:33:24 +0000 (17:33 -0800)]
Fix lastVisible/global rects
Bug:
5601629
References tend to always be equal to the things they are referencing,
use copies instead.
Change-Id: I0827878e91ef1fa6e0abe2d6499d55f4a211d890
Robert Greenwalt [Fri, 11 Nov 2011 01:22:14 +0000 (17:22 -0800)]
Merge "Fix Wimax-less build." into ics-mr1
Robert Greenwalt [Fri, 11 Nov 2011 00:55:20 +0000 (16:55 -0800)]
Fix Wimax-less build.
A build with the wimax network type defined but wimax disabled
causes an NPE in ConnectivityService's constructor.
bug:
5237167
Change-Id: I929eac217e1afa0e61346fdbc3e96a7d3ad09a54
Romain Guy [Fri, 11 Nov 2011 01:10:41 +0000 (17:10 -0800)]
Merge "Terminate EGL when an app goes in the background" into ics-mr1
Chet Haase [Fri, 11 Nov 2011 01:03:12 +0000 (17:03 -0800)]
Fix leak in LayoutTransition
LayoutTransition was making an incorrect assumption that there could
only be one transition animation on a child of a transitioning container.
But if multiple children are added/removed to/from that container, there would
be multiple calls to set up changing animations for each existing child
of that container. This meant that the child would have multiple, new
OnLayoutChangeListeners added to it as part of the setup process.
Meanwhile, we would cache only the latest listener in a hashmap that used
the child as a key for the listener. Then when we cleaned up the hashmap later,
we would remove only the latest listener from the child, leaving the rest there
for eternity.
The fix is to skip the setup entirely for children that already have listeners
set on them; they must, if that's the case, already have been set up and are
already listening for layout changes. Setting up the animation is redundant,
and adding another listener is a leak.
issue #
5588509: memory leak in systemui
Change-Id: I2c9f312cc2bcf4f2d08ac6b5d8f8e495aa4f3597
Adam Cohen [Thu, 10 Nov 2011 04:10:27 +0000 (20:10 -0800)]
Deferring wallpaper update to improve workspace scrolling (issue
5506959)
-> On the Xoom, this change gets us back up to 60 fps. The
change is really more of a workaround for the fact that we don't
have vsync, and we ought to be able to change it back once we do.
Change-Id: I80888f18887bf5f2fed72c19641ed430ef6dbfcf
Romain Guy [Thu, 10 Nov 2011 04:10:18 +0000 (20:10 -0800)]
Terminate EGL when an app goes in the background
This does not happen on high end gfx devices. This happens
only if only one EGL context is initialized in the current
process.
Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
Mathias Agopian [Fri, 11 Nov 2011 00:38:42 +0000 (16:38 -0800)]
Merge "boot animation is dithered and scaled" into ics-mr1
Jamie Gennis [Fri, 11 Nov 2011 00:06:12 +0000 (16:06 -0800)]
Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
Mathias Agopian [Thu, 10 Nov 2011 23:59:07 +0000 (15:59 -0800)]
boot animation is dithered and scaled
disable dithering which shouldn't have been enabled
in the first place because the frames are typically scaled.
we still use a 16-bits texture format to preserve memory.
Bug:
5600948
Change-Id: Ib4d6e133df4375d0d735cd4325b6e589bbc5dafe
Peter Ng [Thu, 10 Nov 2011 23:42:57 +0000 (15:42 -0800)]
Making the quicksettings notifications icon the right opacity
Change-Id: Ia732a63f02b80ca9ba88533c19a7c47f9b02fc0d
Martijn Coenen [Thu, 10 Nov 2011 23:20:14 +0000 (15:20 -0800)]
Fix NdefRecord byte-stream constructor.
Bug:
5601404
Change-Id: I30fada97487829a8b2ccc1a1e7a32837c29ddd70
Andreas Huber [Thu, 10 Nov 2011 22:48:20 +0000 (14:48 -0800)]
Disconnect on socket error on the RTSP control connection.
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
Romain Guy [Thu, 10 Nov 2011 23:02:07 +0000 (15:02 -0800)]
Merge "Initialize egl_cache with an app writeable file" into ics-mr1
Jeff Brown [Thu, 10 Nov 2011 22:40:48 +0000 (14:40 -0800)]
Merge "Wake on volume key when in dock. Bug:
5580373" into ics-mr1
Jeff Brown [Wed, 9 Nov 2011 04:22:03 +0000 (20:22 -0800)]
Wake on volume key when in dock.
Bug:
5580373
Change-Id: I847fb10b48c2e5e26cabefea1d630793efc32131
Svetoslav Ganov [Thu, 10 Nov 2011 22:31:37 +0000 (14:31 -0800)]
PopupWindow dismiss() can get into a recursive loop.
1. The dismiss method in a PopupWindow is first removing the
popup View from the WindowManager and then if the content
View differs from the popup View the former is removed from
the latter. Then dismiss() clears the dismissed flag so a
subsequent call to dismiss() is a NOP. However, removing
a View both from the WindowManager and from its parent
ViewGroup triggers stuff wich may lead to a subsequent call
to dismiss(). This leads to a stack overflow exception.
bug:
5598944
Change-Id: I2aeeda591be3e9aa98fec1ee17ea8f0e746e6992
Peter Ng [Thu, 10 Nov 2011 22:31:09 +0000 (14:31 -0800)]
Merge "lock pattern width spec set to max" into ics-mr1
Peter Ng [Thu, 10 Nov 2011 22:26:57 +0000 (14:26 -0800)]
Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
Peter Ng [Thu, 10 Nov 2011 01:46:27 +0000 (17:46 -0800)]
Cleaning up tablet assets by deleting drawable-xlarge and large folders
-keeping default wallpaper in xlarge-nodpi
Bug:
5596158
Change-Id: I18ec8b0aa648fa95a1f6ebb4380c630f05e24ecb
Katie McCormick [Thu, 10 Nov 2011 22:20:37 +0000 (22:20 +0000)]
am
921afe39: Doc change: new Calendar content provider doc
* commit '
921afe39d6041b06c6a002b08f9dcd1561a9ae99':
Doc change: new Calendar content provider doc
Romain Guy [Thu, 10 Nov 2011 22:20:10 +0000 (14:20 -0800)]
Initialize egl_cache with an app writeable file
Change-Id: I5dda234feab0fedd6e4179a80715ae20dee1c833
Adam Powell [Thu, 10 Nov 2011 22:16:45 +0000 (14:16 -0800)]
Merge "Fix access modifiers on ImageView overrides" into ics-mr1
Dianne Hackborn [Thu, 10 Nov 2011 22:12:25 +0000 (14:12 -0800)]
Merge "Fix issue #
5470311: Activity with android:configChanges defined..." into ics-mr1
Adam Powell [Thu, 10 Nov 2011 22:11:51 +0000 (14:11 -0800)]
Fix access modifiers on ImageView overrides
Change-Id: I64cc10c877ac4adc4b79abcd7c7617480bd82906
Adam Powell [Thu, 10 Nov 2011 21:57:24 +0000 (13:57 -0800)]
Merge "Fix bug
5581874 - Animated drawables don't start as expected" into ics-mr1
Martijn Coenen [Thu, 10 Nov 2011 21:48:02 +0000 (13:48 -0800)]
Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1
Chet Haase [Thu, 10 Nov 2011 21:44:34 +0000 (13:44 -0800)]
Merge "increase the rate at which we dispatch events." into ics-mr1
Martijn Coenen [Thu, 10 Nov 2011 21:18:53 +0000 (13:18 -0800)]
Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
This reverts commit
562dfff65ac79590c0b7c50019cd3d107e8b4e0e. These API's are still used
by GMM in the version that ships with MR1, so we need them to keep Beam working for
GMM. Note that these APIs are hidden.
From version 5.13 onwards GMM will use the new API's.
Change-Id: I316a9c9b7d0052a14f6c1df70f2ed463bca61800
Kenny Root [Thu, 10 Nov 2011 21:18:24 +0000 (13:18 -0800)]
Merge "Close file on exception as well" into ics-mr1
Tom Taylor [Thu, 10 Nov 2011 21:11:16 +0000 (13:11 -0800)]
Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1