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.
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'
* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
Make the file backup helper not crash if a file you requested
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
Merge commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e'
* commit 'f229aff118dc53c3a06f0b4120d9ce22f4c2dd6e':
Update control files (pass/fail/nontext/crash) to results from CRB45
* changes:
Make the file backup helper not crash if a file you requested can't be stated. This means you don't need to know if the files you are backing up exist or not -- we'll figure it out for you.
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
Merge commit '4a60b887d4b9744126e62b094a9597ee8e924640'
* commit '4a60b887d4b9744126e62b094a9597ee8e924640':
Added support to record page load time for each url.
Merge commit '174ad503ee5b24721d7d632ba9c68b9cd0bd6dd6'
* commit '174ad503ee5b24721d7d632ba9c68b9cd0bd6dd6':
In SearchablesTest, use the always available globalsearch.
The earlier used googlesearch package may not be available in some devices so switching to globalsearch which has searchable info relevant for this unit test.
