Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b'
* commit '2c10b5f483f832523305c11d44035fc7f5d9a54b':
Make all static methods in SearchManager non-static.
They were only static because of a now removed restriction that
only activity contexts could instantiate SearchManager.
This only changes hidden APIs, but all users of the changed methods
must be updated to use them non-statically before this is submitted.
Since https://android-git.corp.google.com/g/3880
all activities create a SearchManager object, to handle
saving and restoring the search dialog. This broke
ActivityUnitTestCase, since ApplicationContext.getSearchManager()
threw an exception in non-activity contexts.
This change removes the activity context check from
getSearchManager(). Since SearchManager is now just a thin
wrapper for SearchManagerService, there shouldn't be anything
activity-specific in it.
Fixes http://b/issue?id=1926254
Merge commit '3e3324bae45ff21615c07507e6918ad21681a6a2'
* commit '3e3324bae45ff21615c07507e6918ad21681a6a2':
Merge the change in cupcake_dcm so that Contacts app is able to use it.
Merge commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94'
* commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94':
Fixes#1926784. Setting android:ellipsize on an EditText now ellipsizes the hint.
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 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf'
* commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf':
Add a new checkin server flag for Vending Machine heartbeats.
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.
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
