The ad-hoc blacklist has been replaced by a check that whitelists each restored
datum against the set of keys that we actually back up. Keys read from the
restore data which are not found in the whitelist are not applied.
Also adds in some more debugging output, marked to be disabled for ship.
Merge commit '63147705bc2893d6ad43270e04beb9ee01e2ad53' into eclair-plus-aosp
* commit '63147705bc2893d6ad43270e04beb9ee01e2ad53':
Don't show the badge background when we have no uri, email, or phone.
Merge commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3' into eclair-plus-aosp
* commit 'b03b3bbd6833f7c6fbd8100fa3958220554f66a3':
If backup fails, reenqueue all of the affected packages for next time.
Merge commit '36dac6ae8e005f0247e44345727d1580b1623127' into eclair-plus-aosp
* commit '36dac6ae8e005f0247e44345727d1580b1623127':
Bring the dimples back, and make the "spin around" animation have a fling feeling.
Merge commit '9bfb707597898f54722460b48588007b682f3e2a' into eclair-plus-aosp
* commit '9bfb707597898f54722460b48588007b682f3e2a':
Various fixes and improvements to window, activity.
Merge commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf' into eclair-plus-aosp
* commit 'c0b8a96d28c55cb51e4f9e1f85c8d3ecf1ff13bf':
launching plugin activity when a plugin requests to go full screen.
- New meta-data you can add to a dock activity to have it launched by the
home key when the device is in that dock.
- Fix a deadlock involving ActivityThread's internal content provider lock.
- New window flag to have a non-secure keyguard entirely dismissed when a
window is displayed.
- New WindowManagerPolicy APIs to allow the policy to tell the system when
a change it makes during layout may cause the wall paper or
overall configuration to change.
- Fix a bug where an application token removed while one of its windows is
animating could cause the animating window to get stuck on screen.
Change-Id: I6d33fd39edd796bb9bdfd9dd7e077b84ca62ea08
Merge commit '34ca22d25303633c855a738409ea2f8e3f79a713' into eclair-plus-aosp
* commit '34ca22d25303633c855a738409ea2f8e3f79a713':
Set the bonding for incoming connections only when authentication is requested.
Merge commit '6c644f248f553898248b8a6948fac4d62874fedd' into eclair-plus-aosp
* commit '6c644f248f553898248b8a6948fac4d62874fedd':
Add parameter for the restore set (device id) data is being restored from to the restore_start event
Merge commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb' into eclair-plus-aosp
* commit '916b2ca9375b0a6a54e2bef2b2b5faab23ac3cfb':
Use FLAG_ACTIVITY_CLEAR_TOP when launching search suggestions.
Merge commit '78f180af218017898593021a0b7fdf9b38aa2b25' into eclair-plus-aosp
* commit '78f180af218017898593021a0b7fdf9b38aa2b25':
Update viewport when height or width change.
* changes:
1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
Merge commit 'dee76be487fcdc975877f85221a693b87b9669a7' into eclair-plus-aosp
* commit 'dee76be487fcdc975877f85221a693b87b9669a7':
Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit '24a3ff958b87550904a71961835f6883d1411c27' into eclair-plus-aosp
* commit '24a3ff958b87550904a71961835f6883d1411c27':
Change double tap toast to long toast.
Merge commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31'
* commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31':
Reimplement the settings to use async callbacks
Merge commit '194099dc4f614130f3baff14850792e6dc3fa59b' into eclair-plus-aosp
* commit '194099dc4f614130f3baff14850792e6dc3fa59b':
Reimplement the settings to use async callbacks
2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases.
3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
Merge commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3'
* commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3':
Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
Merge commit '909e7b8c9d94e28978721874a574ffbe84ef3b36'
* commit '909e7b8c9d94e28978721874a574ffbe84ef3b36':
Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit '0676690091b348d939db0340c3a0d888683c1abb' into eclair-plus-aosp
* commit '0676690091b348d939db0340c3a0d888683c1abb':
Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
Merge commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a' into eclair-plus-aosp
* commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a':
Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit '263a2f5031f50d020a51d45ef26b99dcee5cb65e'
* commit '263a2f5031f50d020a51d45ef26b99dcee5cb65e':
Support the new dpi change in the WebView.
Merge commit '408cf85207a43c9169f9fb520a584d2858847d24' into eclair-plus-aosp
* commit '408cf85207a43c9169f9fb520a584d2858847d24':
Support the new dpi change in the WebView.
Merge commit '1e577ced7dcd973267f38351616d28f8a090f013'
* commit '1e577ced7dcd973267f38351616d28f8a090f013':
Make media scanner read the jpeg orientation tag.
