Merge commit '0fb041f364355c438eb7d508eb7fa7946418cd11'
* commit '0fb041f364355c438eb7d508eb7fa7946418cd11':
remove the SubscribedFeedsProvider since it has been moved to vendor/google
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.
Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5'
* commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5':
Fix stopping all vpn daemons before connect and more.
Merge commit '6a444d4f5060a720d77daf8a81452566e327f266'
* commit '6a444d4f5060a720d77daf8a81452566e327f266':
Turn off the last of the STOPSHIP verbose debugging
Merge commit '6678aeccec58f5ff306fb93ad4411208ed6227db'
* commit '6678aeccec58f5ff306fb93ad4411208ed6227db':
Turn off most of the backup-related debug logging
* move DaemonHelper out from VpnService to VpnDaemons for better
managing native daemons.
* check connectivity and dns less frequently to save battery.
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.
Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
Merge commit '2d5168f650b1865812b1174ea1c37df9bfda6390'
* commit '2d5168f650b1865812b1174ea1c37df9bfda6390':
Add auto-brightness mode to the list of backed-up settings
Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7'
* commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7':
Don't restore any setting that we don't think should be backed up
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.
Add API to skip the animation for a particular start activity, so that
a latter better one can be used.
Fix Theme.NoDisplay to actually work.
Fiddle with various animations: don't do a different animation for task
switching, try a scale animation for switching in/out of the wallpaper.
Adjust the animation duration so that at normal speed we have something
more like the slower animation option (so slow is now the default).
Change-Id: Ieba9f3db0bd9a762a19b327a3ecccbc7b547893d
Merge commit '9122a49cd68ab2a472516c568298699f376bf80a'
* commit '9122a49cd68ab2a472516c568298699f376bf80a':
Don't back up / restore certain sync-related settings
In particular, this no longer attempts to back up the on/off state of specific
backend syncing [gmail/contacts/calendar], nor the "background data" toggle.
The former was causing a great deal of spurious trips through backup as the
notification was being tickled during general sync operation, and the latter
makes little sense at restore time.
Fixes these issues:
b/2097613 - frequent "backup_data_changed" messages in event log
b/2131662 - should not backup background data, master sync settings
Merge commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f'
* commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f':
Save and restore partial supplicant data, not the whole file.
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ice757f7ae87902bdfb3634471cf44f020ebfaae4
Signed-off-by: Mike Lockwood <lockwood@android.com>
