Merge commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10'
* commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10':
Change addCertificate to take byte[] instead of String as we don't know the encoding.
Merge commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5'
* commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5':
Added in Settings.Secure default country and variant for the default TTS language.
It doesn't make much sense to ellipsize the text entered by the user, so we
just ellipsize the hint. This avoids introducing a new XML attribute/Java API
just for the particular case of ellipsizing the hint.
ContactsContract now contains all the useful constants that are
contained in Contacts.Intents. Because we have to continue to
support the Contacts interface, the constants are kept there,
but now simply reference the real versions in Contacts.Intents.
Contacts.Intents will be deprecated and developers are encouraged
to move to Contacts.Intents.
Merge commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929'
* commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929':
when we reset a paint, it should return to the state it was in when it was first created.
* changes:
when we reset a paint, it should return to the state it was in when it was first created. for java, this means setting its text-encoding to UTF16...
Merge commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429'
* commit 'f781b39cb89dc19e6ad090bd3eb1bedbe7928429':
gps: Set SUPL server via hostname rather than IP address.
Merge commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf'
* commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf':
Add a new checkin server flag for Vending Machine heartbeats.
The GPS engine needs the hostname for the secure SUPL case
and deferring the DNS lookup to the HAL might be helpful in the future
if the SUPL server is on a carrier's private network.
Signed-off-by: Mike Lockwood <lockwood@android.com>
The check for allowing the start of an activity was broken, it was
comparing the process of that activity's application vs. the current
instrumentation target package name. Okay it was utterly insane.
Now this check is that the target activity will be running in the
same process as the instrumentation, which is really what we want.
Merge commit '03255de32d127d17504b6d475e6e79190dd637f8'
* commit '03255de32d127d17504b6d475e6e79190dd637f8':
Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
Merge commit '697f9caf8b63fa87ecfeb9a29aa129ba5321641f'
* commit '697f9caf8b63fa87ecfeb9a29aa129ba5321641f':
Use standalone month name instead of format month name in year-month format.
This is a monotonically increasing integer. Wraps to 0 at
Integer.MAX_INT, and at boot.
Current implementation returns the number of AT commands handled since
boot. This is a good indicator for spammy headset/handsfree units that
can keep the device awake by polling for cellular status updates. As a
rule of thumb, each AT command prevents the CPU from sleeping for 500 ms
Merge commit 'e0b7e916a1259d2dd9c116695607f9877ec56056'
* commit 'e0b7e916a1259d2dd9c116695607f9877ec56056':
Replace the dummy code with Keystore for <keygen> support.
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'
* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
Make RestoreHelper and friends also write out the snapshot state.
