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.
Merge commit 'f9acde27486bcc6eea1092073f7b47c31749efd6'
* commit 'f9acde27486bcc6eea1092073f7b47c31749efd6':
Include web search providers in Searchables.
- Along with ACTION_SEARCH we now enumate ACTION_WEB_SEARCH as well so web search providers are covered in the searchables list. This fixes a broken unit test.
- Moved get/setPreferredWebSearchActivity and get-all-web-search-providers implementation to this module when the searchables list gets updated, so that it happens on boot and on package add/remove events and remains up to date. The duplicate code in WebSearchProvider will be removed in a separate change.
- Also made Searchables broadcast an intent when the searchables list got rebuilt, so components such as GlobalSearch/SuggestionSources no longer need to do this on their own.
Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696'
* commit '2a3188672ab2b65c0ce7c9c598a463e382c47696':
rename a few files to camel-case, add copyright notices
Merge commit '85dfec8c35d4e3216591bd2e534bbebd6338b969'
* commit '85dfec8c35d4e3216591bd2e534bbebd6338b969':
Added bugreport collecting mechanism in case of crashes.
Merge commit '5de674e1cbd6e43b6d7954ccacf5cd709b30265d'
* commit '5de674e1cbd6e43b6d7954ccacf5cd709b30265d':
Adding missing callback onJsConfirm to dismiss any confirmation dialogs
fix a bug in GL lighting where the specular component could be ommited when vertex material was disabled.
Merge commit '3e8950c0c73f9c1574ce3388c754009edf6bc930'
* commit '3e8950c0c73f9c1574ce3388c754009edf6bc930':
Added new parameter to enable a manual pause between pages
Before, the variants of MemoryFile.MemoryInputStream.read() would throw
IOException or IndexOutOfBoundsException if EOF was encountered
before the requested number of bytes was read. This violates
the contract of InputStream.read().
This patch makes read() return the number of bytes available, if any.
If already at EOF, -1 is returned. The patch also adds new tests,
which checks cases where MemoryFile.MemoryInputStream.read()
should throw IndexOutOfBoundsException or return -1. several of these
tests failed with the old code and pass now.
This fixes http://b/issue?id=1881894
This allows content providers to use in-memory data to implement
ContentProvider.openAssetFile(), instead of just normal files
and sockets as before.
To test cross-process use of AssetFileDescriptors for MemoryFiles,
a test content provider and a client for it are added to
AndroidTests.
Fixes http://b/issue?id=1871731
Merge commit '7322c96cc0c2524d399fb43fb406fb6324a795c8'
* commit '7322c96cc0c2524d399fb43fb406fb6324a795c8':
Fixed issue where code for extracting scripts was eclipsed by runTest method.
