Dianne Hackborn
7ddf38a5bf
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.
2011-11-11 16:13:46 -08:00
Dianne Hackborn
be70785f9b
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
2011-11-11 15:05:59 -08:00
Robert Greenwalt
3100e2b017
am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1
...
* commit '24597eb77e1a88994b83c5b1f45d5b72383943b8':
Tone down Tethering logs.
2011-11-11 14:38:34 -08:00
Robert Greenwalt
24597eb77e
Merge "Tone down Tethering logs." into ics-mr1
2011-11-11 14:37:18 -08:00
Dianne Hackborn
0b554bab58
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...
2011-11-11 14:26:30 -08:00
Christopher Tate
9acae658e1
am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
...
* commit '847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
Localized optimizations in views and bitmaps
2011-11-11 14:26:28 -08:00
Dianne Hackborn
d400d03f4a
Merge "Fix issue #5595933 : GREF leak due to race condition in..." into ics-mr1
2011-11-11 14:24:58 -08:00
Christopher Tate
847fbbeaf9
Merge "Localized optimizations in views and bitmaps" into ics-mr1
2011-11-11 14:24:53 -08:00
Robert Greenwalt
fd1be2bc1e
Tone down Tethering logs.
...
bug:5601582
Change-Id: I66c0a5a06a2c13a7cf93ea264d156b37df23745f
2011-11-11 14:09:45 -08:00
Nick Pelly
4780228fb2
am 48b651cb: Merge "Changes for access control." into ics-mr1
...
* commit '48b651cb2a3afab979c2a46185fd7edfa5424387':
Changes for access control.
2011-11-11 13:08:37 -08:00
Nick Pelly
48b651cb2a
Merge "Changes for access control." into ics-mr1
2011-11-11 13:06:44 -08:00
Christopher Tate
1373a8eb58
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
2011-11-11 12:46:48 -08:00
Dianne Hackborn
5a6ef737ed
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
2011-11-11 12:31:52 -08:00
Matthew Xie
5a8ad0717d
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
2011-11-11 12:18:22 -08:00
Matthew Xie
a303f0ecfc
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
Matthew Xie
98f06da8ed
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
2011-11-11 12:11:35 -08:00
Peter Ng
b88cd4bea3
am 20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
...
* commit '20d8c5ed96d6fb81d14cbce5221025ed6c954d6e':
Making the quicksettings notifications icon the right opacity
2011-11-11 11:59:40 -08:00
Peter Ng
20d8c5ed96
Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
2011-11-11 11:57:41 -08:00
Dianne Hackborn
8f45e3e280
am be425cce: Merge "Fix issue #5522658 : Menu button shown on lock screen if app underneath requests it" into ics-mr1
...
* commit 'be425ccea47c13d3f8f3d877fdbdcb3c074f7e8b':
Fix issue #5522658 : Menu button shown on lock screen if app underneath requests it
2011-11-11 11:48:33 -08:00
James Dong
9a176507a9
am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
...
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
Unhide the key to retriever location information in 3gp/mp4 files
2011-11-11 11:48:27 -08:00
Andreas Huber
8a0654231f
am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
...
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
Didn't mean to check this in...
2011-11-11 11:48:16 -08:00
Robert Greenwalt
2c41bce3f2
am 424781e2: Fix NPE in ConnectivityService.
...
* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
Fix NPE in ConnectivityService.
2011-11-11 11:48:11 -08:00
Eric Laurent
2c29a5cf16
am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
...
* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
visualizer: reset buffer if playback is idle
2011-11-11 11:48:05 -08:00
Andreas Huber
40461ee701
am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
...
* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
Instead of asserting, signal a runtime error if the session doesn't contain
2011-11-11 11:48:00 -08:00
Andreas Huber
9a87a83802
am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
...
* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
2011-11-11 11:47:58 -08:00
Andreas Huber
9c981cd3d5
am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
...
* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
Disconnect on socket error on the RTSP control connection.
2011-11-11 11:47:57 -08:00
Narayan Kamath
405fcc87b2
am 754c72ed: Notifiy callers when a speech synthesis error occurs.
...
* commit '754c72ed9e8e83e5a913aa7552fc2e1b1b5277e0':
Notifiy callers when a speech synthesis error occurs.
2011-11-11 11:47:54 -08:00
Dianne Hackborn
be425ccea4
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
b7a000a6fb
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
2321718274
Merge "Didn't mean to check this in..." into ics-mr1
2011-11-11 10:46:02 -08:00
Andreas Huber
54c7efa4dd
Didn't mean to check this in...
...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
2011-11-11 10:17:00 -08:00
Robert Greenwalt
424781e2e1
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
2011-11-11 09:56:03 -08:00
Jeff Hamilton
bb951c8939
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
2011-11-11 08:55:26 -08:00
Eric Laurent
1f8c621279
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
2011-11-11 08:17:22 -08:00
Andreas Huber
cd556b82fd
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
5d42075e45
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
d9f25bc941
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
2011-11-11 07:39:11 -08:00
James Dong
510180f162
am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
...
* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
Add support for retrieving location information in mp4/3gpp files
2011-11-11 15:28:32 +00:00
Akwasi Boateng
cb0db0306b
Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
2011-11-11 15:20:20 +00:00
Svetoslav Ganov
2b51019220
am d00e75e9: am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
...
* commit 'd00e75e94d1aa5cee740a06a4ce760e49016f7f6':
PopupWindow dismiss() can get into a recursive loop.
2011-11-11 15:12:58 +00:00
Chet Haase
025e948d77
am ab51626f: am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
...
* commit 'ab51626f22259e27ef376cbbc1d127524a57459d':
DO NOT MERGE. Fix leak in LayoutTransition
2011-11-11 15:12:56 +00:00
Jamie Gennis
1dd80cf4d4
am 787e2c27: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit '787e2c276a5645ffbaddc5c23f4deb66d182e80d':
SystemUI: Disable HW acceleration for status bar
2011-11-11 15:12:55 +00:00
Jeff Sharkey
0a63214f39
am 51c00a57: Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
...
* commit '51c00a57f4f956b4b0ce9562fa571b475ee6f6ae':
Clamp non-monotonic stats instead of dropping.
2011-11-11 15:12:51 +00:00
Daniel Sandler
b291fa96e3
am 992e77af: Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
...
* commit '992e77af1168ddce232b9b7702d01e5ccc7a249b':
Fold WiMAX state into the mobile RSSI.
2011-11-11 15:12:49 +00:00
Daniel Sandler
8c2ef85cce
am 8b50bd8c: Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
...
* commit '8b50bd8c9ba594e2516014fcc4b950b8deb36312':
Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:12:48 +00:00
Adam Powell
fcba1b60a8
am 0ddcad0b: Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1
...
* commit '0ddcad0b4e203fe56aeca74547b13f6063ccb13b':
Make the overridden ImageView#setVisibility remotable
2011-11-11 15:12:46 +00:00
Adam Cohen
33be88cba8
am d562d300: Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1
...
* commit 'd562d300cde63ae023f09fc3c7ded0988dead5d1':
Deferring wallpaper update to improve workspace scrolling (issue 5506959)
2011-11-11 15:12:45 +00:00
John Reck
204a828599
am 9490fe40: Merge "Fix lastVisible/global rects" into ics-mr1
...
* commit '9490fe4095171b9af380812b895101f8142d3cd5':
Fix lastVisible/global rects
2011-11-11 15:12:41 +00:00
Martijn Coenen
059977594f
am 99898de9: Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
...
* commit '99898de902c36687be126b33ee8a4858d26871ac':
Fix NdefRecord byte-stream constructor.
2011-11-11 15:12:36 +00:00
Chet Haase
56a4748111
am 692fda9d: Merge "Fix leak in LayoutTransition" into ics-mr1
...
* commit '692fda9da31e2a25fd295140ec0d8b6cd0a934ee':
Fix leak in LayoutTransition
2011-11-11 15:12:35 +00:00