Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-10-25 21:55:49 +00:00
committed by Android (Google) Code Review
parent 2e7c67f3cd 21984eeaf7
commit db1fd054d2
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -2102,7 +2102,7 @@ public class SettingsProvider extends ContentProvider {
} }
private final class UpgradeController { private final class UpgradeController {
private static final int SETTINGS_VERSION = 130; private static final int SETTINGS_VERSION = 131;
private final int mUserId; private final int mUserId;
@@ -2416,6 +2416,21 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 130; currentVersion = 130;
} }
if (currentVersion == 130) {
// Split Ambient settings
final SettingsState secureSettings = getSecureSettingsLocked(userId);
boolean dozeExplicitlyDisabled = "0".equals(secureSettings.
getSettingLocked(Settings.Secure.DOZE_ENABLED).getValue());
if (dozeExplicitlyDisabled) {
secureSettings.insertSettingLocked(Settings.Secure.DOZE_PULSE_ON_PICK_UP,
"0", SettingsState.SYSTEM_PACKAGE_NAME);
secureSettings.insertSettingLocked(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP,
"0", SettingsState.SYSTEM_PACKAGE_NAME);
}
currentVersion = 131;
}
if (currentVersion != newVersion) { if (currentVersion != newVersion) {
Slog.wtf("SettingsProvider", "warning: upgrading settings database to version " Slog.wtf("SettingsProvider", "warning: upgrading settings database to version "
+ newVersion + " left it at " + newVersion + " left it at "