Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,998 Commits 3 Branches 0 Tags
2f61efa736b3bb2edfc77b7fb6970ebbfdb8e3a8
Commit Graph

63998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
2f61efa736 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':
  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:36 -08:00
Robert Ly
beafb0fc63 am 632f072b: am 5f8b7269: docs: fix typo 
* commit '632f072b223f5f682f4152551a61cec2456b2186':
  docs: fix typo
 2011-11-11 20:34:34 -08:00
Robert Ly
a61bed7292 am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0 
* commit '83c16e2577705b577d2c74d45b0e55a50a0806e2':
  docs: ndk r7 rel notes
 2011-11-11 20:34:33 -08:00
Adam Powell
4b620213b7 am a8743f15: Fix bug 5425280 - Two ActionBar icons show up 
* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up
 2011-11-11 20:34:31 -08:00
Adam Powell
771d0c99f6 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
632f072b22 am 5f8b7269: docs: fix typo 
* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df':
  docs: fix typo
 2011-11-11 19:22:01 -08:00
Robert Ly
83c16e2577 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
Adam Powell
a8743f152a Fix bug 5425280 - Two ActionBar icons show up 
Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
 2011-11-11 18:35:53 -08:00
Christopher Tate
432c210fe3 am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1 
* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
  XML parsing optimizations
 2011-11-11 16:21:52 -08:00
Christopher Tate
c51bb4d394 Merge "XML parsing optimizations" into ics-mr1 2011-11-11 16:19:29 -08:00
Dianne Hackborn
391545ed22 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:23 -08:00
Christopher Tate
60201f2b4e 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
 2011-11-11 16:10:42 -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
Adam Powell
6200a4b7eb 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 2011-11-11 14:54:02 -08:00
Robert Greenwalt
3631261229 am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1 
* commit '24597eb77e1a88994b83c5b1f45d5b72383943b8':
  Tone down Tethering logs.
 2011-11-11 14:39:10 -08:00
Robert Greenwalt
24597eb77e Merge "Tone down Tethering logs." into ics-mr1 2011-11-11 14:37:18 -08:00
Dianne Hackborn
75348437a3 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:27:03 -08:00
Christopher Tate
090fb77e58 am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1 
* commit '847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
  Localized optimizations in views and bitmaps
 2011-11-11 14:27:01 -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
Robert Ly
5f8b7269d6 docs: fix typo 
Change-Id: I86ebd8bced2ca133fc6faff43c2e69205f0c9862
 2011-11-11 13:39:34 -08:00
Nick Pelly
1d80311106 am 48b651cb: Merge "Changes for access control." into ics-mr1 
* commit '48b651cb2a3afab979c2a46185fd7edfa5424387':
  Changes for access control.
 2011-11-11 13:08:18 -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
0900fe24d7 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:04 -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
Robert Ly
5ad6f646fb Merge "docs: ndk r7 rel notes" into ics-mr0 2011-11-11 12:06:39 -08:00
Adam Powell
63464c5229 DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an 
overflow menu under invalid circumstances.

Change-Id: Ifb847b914b880ffb21dd5fc6efa833f46466f224
 2011-11-11 12:02:01 -08:00
Peter Ng
496bf91290 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:16 -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
1d72d3276a 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:50:49 -08:00
James Dong
0997fcb6db 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:50:41 -08:00
Andreas Huber
f86639183d 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:50:37 -08:00
Robert Greenwalt
411290aa4b am 424781e2: Fix NPE in ConnectivityService. 
* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
  Fix NPE in ConnectivityService.
 2011-11-11 11:50:34 -08:00
Eric Laurent
9b5b5858e0 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:50:28 -08:00
Andreas Huber
fa0da0e5a5 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:50:23 -08:00
Andreas Huber
9a2bdea328 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:50:21 -08:00
Andreas Huber
1a85af68fc 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:50:20 -08:00
Narayan Kamath
b0e5414647 am 754c72ed: Notifiy callers when a speech synthesis error occurs. 
* commit '754c72ed9e8e83e5a913aa7552fc2e1b1b5277e0':
  Notifiy callers when a speech synthesis error occurs.
 2011-11-11 11:50:18 -08:00
James Dong
d9245e17dc 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 11:50:14 -08:00
Svetoslav Ganov
ffd9a1f226 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 11:50:12 -08:00
Chet Haase
c3abaf4128 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 11:50:10 -08:00
Jamie Gennis
c1c6d708ec 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 11:50:09 -08:00
Jeff Sharkey
94ca29d461 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 11:50:04 -08:00
Daniel Sandler
e7a95e4ade 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 11:50:01 -08:00
Daniel Sandler
aff52bc85f 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 11:49:59 -08:00
Adam Powell
456d05febc am 0ddcad0b: Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1 
* commit '0ddcad0b4e203fe56aeca74547b13f6063ccb13b':
  Make the overridden ImageView#setVisibility remotable
 2011-11-11 11:49:58 -08:00