60121 Commits

Author SHA1 Message Date
Scott Main
9514291901 docs: dashboard update for 11/3
Change-Id: I06428f0a6ae1d905058338bc9bbc584035af1a5f
2011-11-03 13:56:55 -07:00
Eric Fischer
8c49b81b59 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-02 16:17:03 -07:00
Katie McCormick
e08be659eb Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 2011-11-02 15:42:18 -07:00
Eric Fischer
2237e1e7b6 Import revised translations. DO NOT MERGE
Change-Id: I2f073cc6d62d757ba4e6565a0c7974ca9cecba4c
2011-11-02 15:14:43 -07:00
Irfan Sheriff
7f00c22b7f Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 2011-11-02 14:37:19 -07:00
Robert Greenwalt
451fa13e82 Merge "Ignore errors when untethering" into ics-mr0 2011-11-02 14:26:45 -07:00
Katie McCormick
0d842cc918 Doc change: Update instructions to match ICS UI
Change-Id: I565ef27401d169ff28b21f1679e56a725c1ac470
2011-11-02 14:07:52 -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
aea8d85003 docs: a couple typos
bugs 5552478 5553096

Change-Id: Ibeafacd446edf99096e125f5dfaa7c13a6ab1776
2011-11-02 12:05:51 -07: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
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
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
Katie McCormick
d5b25ecc07 Merge "Doc Update: Update list of widget classes" into ics-mr0 2011-11-01 17:09:44 -07:00
Katie McCormick
f99c887ae6 Doc Update: Update list of widget classes
Change-Id: I820848b45e991be6e5b7e7bc2f280caf60fb7f7e
2011-11-01 16:49:23 -07:00
Irfan Sheriff
2cef1292c2 Specify component name for provisioning
Bug: 5544654
Change-Id: I977cad131f7c4d9776997fc3153f4c0d12063af2
2011-11-01 15:48:23 -07:00
Dima Zavin
f0ad147fc3 Merge "BatteryService(jni): properly handle read's return value" into ics-mr0 2011-11-01 15:29:42 -07:00
Robert Greenwalt
bd9b152805 Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 2011-11-01 13:27:56 -07:00
Fabrice Di Meglio
46e327ca32 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
Irfan Sheriff
bbe77ca6be Avoid duplicate dialogs leading to NPE
Bug: 5548268
Change-Id: I383d5dba5ed2d77c1623d03990f1139872a65e2a
2011-11-01 12:04:57 -07:00
Robert Greenwalt
57c8ac6e13 Add cdma_rmnet4 to list of monitored interfaces
Lets the data traffic arrows work on LTE device on 1x,
but also lets telephony monitor for hung radios on 1X.

bug:5531630
Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
2011-11-01 11:51:27 -07:00
Fabrice Di Meglio
26e9ee28de Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
2011-11-01 10:49:44 -07:00
The Android Open Source Project
9eb4c891a3 Reconcile with ics-factoryrom-2-release
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
2011-11-01 10:08:15 -07:00
Jim Miller
1dce37bd6b Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 2011-11-01 00:47:44 -07:00
Chih-Chung Chang
4b6353ea02 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07:00
Jim Miller
9fa1ada318 Fix 5497305: Make sure we show SIM unlock when "None" is selected
Previously the code ignored SIM state when lockscreen was set to "None."
It now properly accounts for the SIM state when deciding to show.

Change-Id: I272348c1a21b57ac146910850ea3db3adef0227c
2011-10-31 18:21:49 -07:00
Stephen Hines
af675222f6 Merge "Fix potential segfault in RS watchdog." into ics-mr0 2011-10-31 17:14:58 -07:00
The Android Automerger
3b25c4d845 Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-10-31 16:47:11 -07:00
Eric Laurent
6e91e5b689 Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00
Martijn Coenen
1eca250b9d Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07:00
Stephen Hines
a049184274 Fix potential segfault in RS watchdog.
BUG=5544671

This initializes the watchdog structure properly. Without this fix, it is
possible to call LOGE with a garbage string value.

Change-Id: Ie05eb65f83eca938f18ac962794407d58c3f277f
2011-10-31 15:42:40 -07:00
Martijn Coenen
deb0f20c3d Fix disableForegroundNdefPush crash.
It crashed due to the fact that we're committing a fragment change
after onSaveInstanceState() is called. Instead, commit without
storing the state - as the NfcFragment is something that needs
to be setup explicitly anyway, it is not something the user
expects to be restored.

Bug: 5540962
Change-Id: I5a8cd0e47306f2bbc14b592a0182083bb79cb21a
2011-10-31 15:42:13 -07:00
Svetoslav Ganov
aeb11b5988 Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:57 -07:00
The Android Open Source Project
50d0511ddb Reconcile with ics-factoryrom-2-release
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
2011-10-31 12:43:39 -07:00
Eric Laurent
8ca9a1cf35 Fix volume indication in vibrate mode.
The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
2011-10-31 12:12:37 -07:00
The Android Automerger
22e65e4935 Revert "Improve the slow query instrumentation."
This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
2011-10-30 13:56:11 -07:00
The Android Automerger
9ec258c86a merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-30 12:35:09 -07:00
Dima Zavin
98e044a609 BatteryService(jni): properly handle read's return value
Change-Id: I10f5cf3728424e7f5a0c1b460049102fd00a6246
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-28 23:15:11 -07:00
The Android Automerger
ce8e31ea5a Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-10-28 20:40:07 -07:00
Svetoslav Ganov
a840462feb Folding Accessibility Service sample into ApiDemos.
1. Moving Accerssibility Service sample into ApiDemos since
   we are putting all accessibility samples there.

Change-Id: If2deec7f6ad49b0d50112300eda0f7cb48660450
2011-10-28 19:16:24 -07:00
Amith Yamasani
69e640ee84 Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 2011-10-28 18:59:11 -07:00
Amith Yamasani
c696a53d1f Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.

Bug: 5530217

Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
2011-10-28 18:40:43 -07:00
Jeff Brown
2d280f754e Merge "Improve the slow query instrumentation." into ics-mr0 2011-10-28 18:21:05 -07:00
Eric Fischer
2cc1c5d067 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-28 17:29:12 -07:00
Eric Fischer
9853b74653 Import revised translations. DO NOT MERGE
Change-Id: I1aaff923057636af5f68cc730d889adb201f9fc8
2011-10-28 17:02:44 -07:00
Scott Main
8dbe177c5d Merge "docs: fix spell checker client location" into ics-mr0 2011-10-28 15:57:45 -07:00
Scott Main
2323e9bcdc docs: fix spell checker client location
Change-Id: Ic94eab2720cd96b1130869d2071c635b4acb27f5
2011-10-28 15:55:39 -07:00
Joe Fernandez
09848bc89d Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 2011-10-28 15:40:11 -07:00
Justin Ho
c1cf3b160b Merge "Vertically center the landscape navigation bar." into ics-mr0 2011-10-28 15:01:19 -07:00
Jeff Brown
89101cd9d9 Improve the slow query instrumentation.
On user-debug and eng builds, you can set the
"db.log.slow_query_threshold" system property to queries that
take longer than the specified number of milliseconds.
Set it to 0 to log all queries.

This property has been around for a while but it was implemented
poorly.  In particular, it *changed* the behavior of the query
by calling getCount() while holding the Db connection.
In normal operation, the query will not actually run until later.

By putting the timing logic into fillWindow() instead, we ensure
that we only measure queries that actually ran.  We also capture
cases where the cursor window gets filled multiple times.

Bug: 5520301
Change-Id: I174f5e1ea15831a1d22a36e9a804d7755f230b38
2011-10-28 14:58:39 -07:00