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
As of this change, LocalTransport is successfully propagating data changes from
the backup data format into a repository stored in /cache/backup/[packagename].
Each backup key gets a separate file there for ease of manipulation and testing.
The general semantics of BackupDataReader have been tweaked, too; it now just
returns simple "we're done with the data" when it hits the end, even if no
footer has been found, because on the writing side the footer isn't being
written. Also, reading an entity now merely requires a "big enough" buffer, not
an exactly-sized one.
This is all a work in progress, but this is at least working now for purposes of
this local transport.
Still to do: proper change vs deletion detection, as well as expanding the data
format itself to include necessary metadata etc.
ViewGroup was trying to access the AttachInfo without checking whether the
info object is null. The object can be null at varioous times in the lifecycle
of a list.
It is only used for numeric dates -- spelled-out dates have such a complex
variety of formats that they can only be meaningfully formatted from
locale strings.
In addition, the preference is left null when initializing, on the assumption
that the locale will still specify a more useful numeric format than we can
guess as part of a build-wide configuration.
But if the user has specified a format, the date will be formatted in the
order they asked for, with locale-appropriate punctuation substituted in.
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.
