Robert Greenwalt
7e7fe83cd0
am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0
...
* commit '4a113251078ad028d1a071ebf5562185275c7039':
Ignore errors when untethering
2011-11-02 21:30:30 +00:00
Robert Greenwalt
4a11325107
am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0
...
* commit '451fa13e82ea1226895b41282fdb33bf9fea5d19':
Ignore errors when untethering
2011-11-02 21:28:33 +00:00
Robert Greenwalt
451fa13e82
Merge "Ignore errors when untethering" into ics-mr0
2011-11-02 14:26:45 -07:00
Robert Greenwalt
731026c2df
Ignore errors when untethering
...
Sometimes the interface is removed before we can untether leading to
errors when cleanup up various rules (iptables). Do as much as we can
and then let a re-tether result in error if needed.
bug:5536516
Change-Id: Ib1d064ecc8e9022566f9b0e4678b33144906971c
2011-11-02 13:53:28 -07:00
Scott Main
13462bcbd9
am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096
...
* commit '42774decd903d0bbd1c57c9aa829719f2a683231':
docs: a couple typos bugs 5552478 5553096
2011-11-02 19:12:04 +00:00
Scott Main
42774decd9
am aea8d850: docs: a couple typos bugs 5552478 5553096
...
* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11':
docs: a couple typos bugs 5552478 5553096
2011-11-02 19:10:21 +00:00
Scott Main
aea8d85003
docs: a couple typos
...
bugs 5552478 5553096
Change-Id: Ibeafacd446edf99096e125f5dfaa7c13a6ab1776
2011-11-02 12:05:51 -07:00
Svetoslav Ganov
93517dc3ea
am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
...
* commit '1997fe1482ecf1ca920c7729a1ad9df5340565f3':
Update KeyBoardView to reflect the interaction model in Latin IME
2011-11-02 18:53:52 +00:00
Svetoslav Ganov
1997fe1482
Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
2011-11-02 11:51:58 -07:00
Peter Ng
b1a2b3f5e9
am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1
...
* commit '779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
Make the notification panel header opaque.
2011-11-02 18:49:34 +00:00
Peter Ng
aef92c5cbd
am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1
...
* commit 'c7dbfc640bcbc6a238068742aeaa76473e56037e':
making slide unlock on tablet have a larger radius
2011-11-02 18:49:33 +00:00
Peter Ng
779c1b8507
Merge "Make the notification panel header opaque." into ics-mr1
2011-11-02 11:47:04 -07:00
Peter Ng
c7dbfc640b
Merge "making slide unlock on tablet have a larger radius" into ics-mr1
2011-11-02 11:46:32 -07:00
Amith Yamasani
5cbac4c12e
am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1
...
* commit 'dab15d14ca2ce9c3a614e97869824c6337e76d51':
Don't expand the SearchView if already expanded.
2011-11-02 18:45:38 +00:00
Amith Yamasani
dab15d14ca
Merge "Don't expand the SearchView if already expanded." into ics-mr1
2011-11-02 11:43:53 -07:00
The Android Open Source Project
58a6f23fac
am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
2011-11-02 17:56:48 +00:00
The Android Open Source Project
11b49ba933
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
2011-11-02 10:52:49 -07:00
Adam Powell
7939246dc0
am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1
...
* commit '7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
Bug 5513073 - IllegalArgumentException: View not attached to window manager
2011-11-02 17:50:13 +00:00
Adam Powell
7a5a50c12f
Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1
2011-11-02 10:33:52 -07:00
The Android Automerger
beb470af43
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
...
This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
2011-11-02 10:18:09 -07:00
Svetoslav Ganov
3a0d4d7cbf
am e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1
...
* commit 'e5d0f19953189fdd0e2661ebb7f0ea925f14ea13':
CalendarView title incorrectly updated for different languages.
2011-11-02 17:17:32 +00:00
Svetoslav Ganov
d5a077b89e
am 6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1
...
* commit '6e42470f928bbf60c9fd3d17a2a69a4b96cec170':
Accessibility window query APIs should respect root name space.
2011-11-02 17:17:30 +00:00
Svetoslav Ganov
d55e4cca62
am 7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
...
* commit '7f0c850b7a4a2b8a135a110a33d053f4d6689559':
Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.
2011-11-02 17:15:09 +00:00
Svetoslav Ganov
e5d0f19953
Merge "CalendarView title incorrectly updated for different languages." into ics-mr1
2011-11-02 10:14:46 -07:00
The Android Automerger
8e31988d26
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
...
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
2011-11-02 10:14:18 -07:00
Svetoslav Ganov
6e42470f92
Merge "Accessibility window query APIs should respect root name space." into ics-mr1
2011-11-02 10:13:55 -07:00
Svetoslav Ganov
7f0c850b7a
Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
2011-11-02 10:13:17 -07:00
The Android Automerger
5070dd097c
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
...
This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing
changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
2011-11-02 10:07:57 -07:00
The Android Automerger
5db81e1f1c
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
...
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-11-02 10:05:33 -07:00
The Android Automerger
8063b843e4
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-11-02 09:48:55 -07:00
Daniel Sandler
2f77eae947
Make the notification panel header opaque.
...
Bug: 5504753
Change-Id: If820e4cb0dca342ca2d39ea1eb198987915c58b7
2011-11-02 11:13:27 -04:00
The Android Automerger
27bc922c5b
merge in ics-mr0-release history after reset to ics-mr0
2011-11-02 06:28:40 -07:00
The Android Automerger
116d12b87f
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
...
This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing
changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
2011-11-02 04:41:24 -07:00
Irfan Sheriff
14e04c3385
am f9d8faf7: am 953005e8: Merge "Specify component name for provisioning" into ics-mr0
...
* commit 'f9d8faf7fe9d23bddf4d8d039805bce806e9b9c6':
Specify component name for provisioning
2011-11-02 04:20:49 +00:00
Jeff Sharkey
615ea68a4e
am 9427d688: am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
...
* commit '9427d688bda2d5b177112a58dcfdbcdfdfe98559':
Process AMS events in NetworkPolicy handler.
2011-11-02 04:18:34 +00:00
Irfan Sheriff
f9d8faf7fe
am 953005e8: Merge "Specify component name for provisioning" into ics-mr0
...
* commit '953005e8243e4dc898a00d9a1612ae82772913b9':
Specify component name for provisioning
2011-11-02 04:18:14 +00:00
Jeff Sharkey
9427d688bd
am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
...
* commit 'db0ab2e731d755f64583c5704fa406bc0e7a2af4':
Process AMS events in NetworkPolicy handler.
2011-11-02 04:16:13 +00:00
Irfan Sheriff
953005e824
Merge "Specify component name for provisioning" into ics-mr0
2011-11-01 21:15:26 -07:00
Jeff Sharkey
db0ab2e731
Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
2011-11-01 21:14:35 -07:00
Dianne Hackborn
f30880d154
am 39cec406: Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
...
* commit '39cec40697ab3d1d106e0c0c21458b2085c96f00':
Add new OOM adjustment for the "previous" process.
2011-11-02 04:12:26 +00:00
Dianne Hackborn
39cec40697
Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
2011-11-01 21:11:18 -07:00
Jeff Sharkey
6f7af03cf1
Process AMS events in NetworkPolicy handler.
...
When a process changes foreground status or dies, NetworkPolicy
updates its internal state with a lock held. In cases where there
is contention, this can block the AMS handler and prevent other
events, such as broadcasts, from being dispatched.
This change moves the incoming AMS events to an existing internal
NetworkPolicy handler thread, where they can execute without
blocking AMS.
Bug: 5497544
Change-Id: Ie0c620a620fd9f0f4eb02af510bd819efa4deb6a
2011-11-01 19:37:34 -07:00
Dianne Hackborn
f35fe23669
Add new OOM adjustment for the "previous" process.
...
This is the process that you had previously been interacting with
in the UI before the current one. Treating it specially should
allow us to improve the scenario of switching back and forth
between two apps.
Also add API constent for ICS MR1.
Change-Id: Ib3fe4df36b270be11dfd6b7e8d107c9994058a4d
2011-11-01 19:25:20 -07:00
Fabrice Di Meglio
de0513adaf
am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
...
* commit '07b4b3145333bc8ece9fdbb68ade726b3d6485cd':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
2011-11-02 02:20:19 +00:00
Fabrice Di Meglio
07b4b31453
am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
...
* commit 'bcf05a69090f342d328f1537d1d83406b883290b':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
2011-11-02 02:17:48 +00:00
Adam Powell
89fc3acd4b
Bug 5513073 - IllegalArgumentException: View not attached to window
...
manager
Remove extra queued dialog dismiss messages when applicable. Log an
error if the app tries to dismiss a dialog when its window has been
destroyed.
Change-Id: Ice8383d4420c052e31fbbd9fcd25051f3bd9b58d
2011-11-01 18:50:39 -07:00
Dianne Hackborn
a3ccf0319c
am ad41a94b: Merge "Some optimizations." into ics-mr1
...
* commit 'ad41a94b298f834e13632ee29b27cefd75f10012':
Some optimizations.
2011-11-02 01:07:46 +00:00
Dianne Hackborn
ad41a94b29
Merge "Some optimizations." into ics-mr1
2011-11-01 18:02:44 -07:00
Dianne Hackborn
0500b3cfda
Some optimizations.
...
- Don't try to create a thumbnail bitmap on the client side. This
wastes 64k, and isn't needed since we are doing screenshots.
- Optimize View to put all of the callback pointers out of line.
Added a couple new APIs so these don't need to be protected/public.
- Lazily create ViewGroup's cache paint.
- Change FrameworkPerf app to not use HW accel drawing, to give better
comparison with GB.
Change-Id: Iec56d02459820d74a4cc9c7ec9c1856563c82c7b
2011-11-01 18:01:33 -07:00
Fabrice Di Meglio
bcf05a6909
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
...
- make single run case non verbose
Change-Id: I5c3b87aeb613697233290ddecac3ca00f58f8313
2011-11-01 17:58:00 -07:00