Merge commit 'd42da36810b392867341b07d5bf1f2c47fa71c86'
* commit 'd42da36810b392867341b07d5bf1f2c47fa71c86':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6'
* commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6':
dumpstate: Switch back to running as non-root
Merge commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad'
* commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
Merge commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643'
* commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517'
* commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517':
Various cleanup around resources and nine-patches.
Merge commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f'
* commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f':
Save and restore partial supplicant data, not the whole file.
Merge commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f'
* commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
Merge commit '37f62206236dbfe89c15990cd506e5e40dc256b2'
* commit '37f62206236dbfe89c15990cd506e5e40dc256b2':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '8797066aa8443df38118f24ed46fd052b2f4a37b'
* commit '8797066aa8443df38118f24ed46fd052b2f4a37b':
Move API change details from highlights doc to version notes doc.
Without this we'd only try a secondary APN once and the stop silently, leaving
no APN connected.
Adds a second retry manager with configuration strings to do a more approriate
retry. Don't retry secondary apn forever.
On permanent failure or retry count hit, we send a Phone.REASON_APN_FAILED
disconnect status.
bug: 2112114
Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp
* commit '38eeac305a188b7ea4f586071c1d467c3f952be6':
Don't backup/restore telephony material from secure settings
* Remove several nonportable telephony settings from the set to be included in
the backed-up dataset
* Explicitly ignore those settings if they're encountered during a restore
operation, so that we don't inadvertently do things like configure a GSM
phone to use CDMA logic.
Merge commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61' into eclair-plus-aosp
* commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit '66c2a976705b62fe1721157e934b52d4a49de8f7' into eclair-plus-aosp
* commit '66c2a976705b62fe1721157e934b52d4a49de8f7':
dumpstate: Switch back to running as non-root
It is for bug 1971628 but affects almost every API function in TelephonyManager. When phone is not ready (for example, after crash and restart) the getSubscriberInfo and getITelephony returns null and causes NPE.
Merge commit '02ee5387d3b9904f18d639f4d49612f4b3563eed' into eclair-plus-aosp
* commit '02ee5387d3b9904f18d639f4d49612f4b3563eed':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
1) Handle incoming 2.1 pairing requests
2) Modify displaying error messages on bond failures.
3) Add delay while accepting incoming pairing for certain 2.1 devices.
When MITM is on, the link key request might come more than once.
Auto accept with a delay.
4) Handle DisplayPasskey callback for pairing a 2.1 keyboard with
a 2.1 device
Now that we have straightened out the permissions on /data/dontpanic,
root is no longer necessary.
Change-Id: Ic895d712c2e929e4935707da321e1a2b015285c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '162ec9993e9695946a6b954fd53eebb63e055540' into eclair-plus-aosp
* commit '162ec9993e9695946a6b954fd53eebb63e055540':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit '8cae124af2142687a6833dbaab8a43df6dd67b43' into eclair-plus-aosp
* commit '8cae124af2142687a6833dbaab8a43df6dd67b43':
Various cleanup around resources and nine-patches.
Remove the stuff that doesn't use preloaded drawables when in
compatibility mode, since this works fine ever since we were able
to deal with drawables in a different density than the canvas.
Change the snapshot function on View to return a snapshot at
the same size that will actually be drawn on screen (when in
compatibility mode), to be able to show scaling artifacts and
all.
This change was original an attempt to fix issue #2101917: Text
field edges appears to be improperly rounded. That turns out to
probably be something deeper in the graphics system, but also
included here is the debugging code I did to try to track down the
problem to make it easy to turn on again later.
Change-Id: I34bfca629639c7ff103f3989d88874112ef778d9
Merge commit '7ff269f359a8848fd0c39993d8fe21a8324806f9' into eclair-plus-aosp
* commit '7ff269f359a8848fd0c39993d8fe21a8324806f9':
Handle DisconnectRequested message sent by Bluez.
Merge commit 'd68781ace179e19b70120411baf307104683fa4b' into eclair-plus-aosp
* commit 'd68781ace179e19b70120411baf307104683fa4b':
change default for dither to true
