60137 Commits

Author SHA1 Message Date
David Brown
1a811695f9 Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
The phone app needs a way to distinguish between (a) numbers that are
definitely emergency numbers, and (b) numbers that *might* result in an
emergency call being dialed, but aren't specifically emergency numbers
themselves.

(The phone app needs this distinction in order to enforce the restriction
that 3rd party apps should not be allowed to make emergency calls using
the ACTION_CALL intent, while still making sure that the in-call UI only
displays the "emergency call" state for numbers that are *definitely*
emergency numbers.  See bug 5493790 for the full details;)

So this change adds a full set of "isPotentialEmergencyNumber()" methods
to go along with the "isEmergencyNumber()" methods we've had all along.
The "potential" variants behave identically to the original methods,
*except* that they ultimately use number.startsWith() rather than
number.equals() when comparing against the list of emergency numbers.

TESTED:

- Unit test 'PhoneNumberUtilsTest#testIsEmergencyNumber' passes.
  (The PhoneNumberUtilsTest class doesn't pass in its entirety, but it was
  broken before this change also.)

- Also see the commit description of change
  Ib949fea3c0ce6b341a90e617a03ba3f22c69018b for the exact tests I ran
  against the phone app.

This change should be submitted along with
  Change-Id: Ib949fea3c0ce6b341a90e617a03ba3f22c69018b
in apps/Phone (but this change must go in first to avoid breaking the
build.)

Bug: 5493790
Change-Id: Ic528cfcc555734cdaf4ca8a18a50199771ba49b1
2011-11-08 15:51:50 -08:00
Robert Greenwalt
b445362bd6 Make upstream tether list threadsafe
Outsiders asking for this list may cause the list to change on another thread.
Fixing general synchronization issues.

bug:5531630
Change-Id: I7a3ee0bba3db40f45bcb0159491942fa4cf38c37
2011-11-07 14:44:48 -08:00
Dianne Hackborn
7311bd4b70 Merge "Print out memory info when we get into a low memory situation." into ics-mr0 2011-11-05 00:31:17 -07:00
Dianne Hackborn
04d6db380f Print out memory info when we get into a low memory situation.
Change-Id: I2c8b8847a0f38135d8bf9ff9b7198517c3b0262e
2011-11-04 20:07:24 -07:00
Jeff Brown
5462bc6318 Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
2011-11-04 19:26:03 -07:00
Robert Greenwalt
348297abc0 Merge "Start using IP tool for advanced routing." into ics-mr0 2011-11-04 15:53:37 -07:00
Dianne Hackborn
ca25016775 Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 2011-11-04 14:00:21 -07:00
Dianne Hackborn
9b424b4451 DO NOT MERGE. Integrate: Include showmap output in bug report.
Change-Id: I51265eb248b7eba360f0758fa9eb8a01821f108a
2011-11-04 13:38:18 -07:00
Dave Burke
3ee471889b Frame rate to 48 fps
Change-Id: I95645b3921db22dfeca97ad2743299ccda5de83b
2011-11-04 13:08:15 -07:00
Robert Greenwalt
3b28e9a3da Start using IP tool for advanced routing.
bug:5495862
bug:5396842
Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0
2011-11-04 09:52:04 -07:00
Wink Saville
e4ca92421c Fix the build.
Needed to update EventLogTags.logtags

Change-Id: Ie7d13e012c52778892167380f4fd273f67bb7d62
2011-11-03 23:16:55 -07:00
Dave Burke
32b5a7eeaf Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0 2011-11-03 21:59:20 -07:00
Wink Saville
3d7084519b Merge "Separate data stall detection and recovery from net stats." into ics-mr0 2011-11-03 21:26:35 -07:00
Wink Saville
2861d23d66 Separate data stall detection and recovery from net stats.
Also use the AlarmManager instead of messages so the delays
are consistent whether sleeping or not.

Bug: 5534004
Change-Id: I24118b30214dddf8183c1200a89555d6c528e606
2011-11-03 18:52:58 -07:00
Andreas Huber
efa4015ae3 DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
2011-11-03 18:15:43 -07:00
Katie McCormick
6c5951bf97 Doc change: Updating device-admin with camera info.
Change-Id: I5a5bf50b1362346f0a245ee40248a62a3c94a879
2011-11-03 16:07:05 -07:00
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