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.
Merge commit '79ac87704d2e38afb06356704e4b52c739237f40'
* commit '79ac87704d2e38afb06356704e4b52c739237f40':
Fix a bug where wrong variable was used for comparison.
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'
* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
Make RestoreHelper and friends also write out the snapshot state.
Merge commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9'
* commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9':
add feedback test with gsm7bit special case characters
This also includes some changes to the window manager permission checks. Almost all of these
are to make it most testable (through an exception on a permission failure), though there is
one permission check that needed to be added: updateOrientationFromAppTokens().
Merge commit '9908b3d820f7574ef432f22d280c7f1f5065f67f'
* commit '9908b3d820f7574ef432f22d280c7f1f5065f67f':
More tests to check permissions in PackageManager api's are enforced
Merge commit '3adf7678cdf8fa955627e096bb5c27b94adc3079'
* commit '3adf7678cdf8fa955627e096bb5c27b94adc3079':
Add permission test structure for private framework permissions.
Add <keygen> support for VPN.
Merge commit 'c2922687fa8f953cc1325a6416af5be43cb41fed'
* commit 'c2922687fa8f953cc1325a6416af5be43cb41fed':
Add more data to reliability test report, includes min, max, std, run data.
Merge commit 'd83d6606d62e27effc27be48d6050914deefe9eb'
* commit 'd83d6606d62e27effc27be48d6050914deefe9eb':
Adjust order of file/section list in output diff
Fixes http://b/issue?id=1905863
This is needed to address two security issues with global search:
http://b/issue?id=1871088 (Apps can read content providers through GlobalSearch)
http://b/issue?id=1819627 (Apps can use GlobalSearch to launch arbirtrary intents)
This also fixes http://b/issue?id=1693153 (SearchManager.OnDismissListener
never gets called)
To fix the security issues, GlobalSearch also needs to require
a non-app permission to access its content provider and launch intents.
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'
* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
Fix some backup reader/writer issues; make local transport do backup
Fix the jni initializer.
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
Fix bug #1812041: activity manager crash with bad args.
Journal backup requests so that they won't be lost in a crash
Fix data connection issues.
