Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'
* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'
* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
Remove obsolete FOTA_UPDATE permission (which should never have been
Merge commit 'a03f046522f568a79b75556aa54c0407b1151511'
* commit 'a03f046522f568a79b75556aa54c0407b1151511':
hide the new constant as it is pending api approval
Merge commit '7d143b89b714e077f8fd7dbac80945c76bfd9814'
* commit '7d143b89b714e077f8fd7dbac80945c76bfd9814':
Add the extra data definition for append location in the VIEW request to the Browser.
The old code put the textfield in focus, and resulted in editing
the text semi-appropriately, but now we actually bring up the
WebTextView so that we properly handle the arrow keys, as well
as any substitution that is necessary. This fixes
http://b/issue?id=1918883
Make the blinking caret active when the user actually starts editing
text. To be consistent with that idea, do not rebuild the WebTextView
when the WebView regains focus. Now sendMouseMoveIfLatest takes a
boolean parameter to determine whether to make the focusController
inactive. Requires a matching change in webkit to pass a parameter
to the method. Now that we only call setFocusControllerActive with
false, change the method to no longer take a boolean parameter.
Change names to reflect that.
This change also reflects a behavioral change. If the WebView or
its window lose focus, we do not restore the blinking caret when
focus returns.
Merge commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07'
* commit '77b7d7859ab8a4ab66a31375826ddfe17dc69c07':
Add a Gservices setting to have a "use location for better search".
* changes:
process: Fix bug where if a thread exited while we were changing its control group, we'd bail out and report an exception. This situation is *not* an error.
reintroduced in an errant and clumsy git merge operation.
Also remove permission label and description strings for now-deleted
permissions FOTA_UPDATE and (within the SettingsProvider package)
WRITE_GSERVICES.
* changes:
Remove obsolete FOTA_UPDATE permission (which should never have been made public, and wouldn't be used by any third party applications, and no longer does anything regardless).
made public, and wouldn't be used by any third party applications,
and no longer does anything regardless).
Also remove the WRITE_GSERVICES permission from the SettingsProvider
package's manifest (the declaration there was redundant with the one
in the core manifest, where all the other settings-related permissions
live -- no other core package includes its own permission definitions).
eclair has a _SYNC_ACCOUNT_TYPE field that isn't in donut,
so SELECT_UNSYNC needs to be updated with that field.
The lack of it causes a SQLiteException.
bug=1906760
Merge commit '8e55eac96d768a4de68a091f57487deadf6d0a87'
* commit '8e55eac96d768a4de68a091f57487deadf6d0a87':
Bring the test transport's restore code into line
It now reconstructs the backup data stream as it was originally structured, no
longer assuming that its backed-up records can simply be concatenated into the
destination stream.
Merge commit '3adf7678cdf8fa955627e096bb5c27b94adc3079'
* commit '3adf7678cdf8fa955627e096bb5c27b94adc3079':
Add permission test structure for private framework permissions.
Add <keygen> support for VPN.
The Postal class now contains:
CONTENT_URI
* The content:// style URI for all data records of the
* Postal.CONTENT_ITEM_TYPE mimetype, combined with the associated contact
* and aggregate data.
CONTENT_TYPE
* The MIME type of CONTENT_URI providing a directory of
* postal addresses.
The Phone class now contains:
CONTENT_URI
* The content:// style URI for all data records of the
* Phone.CONTENT_ITEM_TYPE mimetype, combined with the associated contact
* and aggregate data.
CONTENT_FILTER_URI
* The content:// style URI for filtering data records of the
* Phone.CONTENT_ITEM_TYPE mimetype, combined with the associated contact
* and aggregate data. The filter argument should be passed
* as an additional path segment after this URI.
CONTENT_TYPE
* The MIME type of #CONTENT_URI providing a directory of
* phones.
Merge commit '6c84343f0794c368e79c58b715ffad268b8e219c'
* commit '6c84343f0794c368e79c58b715ffad268b8e219c':
Use locale-appropriate formatting to display application sizes like "252KB".
Hashmaps used to pass parameters between WebView.java and
WebViewCore.java are fragile and sometimes require boxing.
Replace them with static classes that are typesafe and use
less code.
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 '6599426f74371c823fcfe570f61577262eb0df44'
* commit '6599426f74371c823fcfe570f61577262eb0df44':
Make the date format preference work again.
Merge commit 'e8939bb8f1453b44788d4475a8263082d858e533'
* commit 'e8939bb8f1453b44788d4475a8263082d858e533':
AI 149797: Have SetupWizard pull the Terms of Service from the web using a new URL
