diff options
| author | Adrian Roos <roosa@google.com> | 2016-10-25 21:55:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-25 21:55:52 +0000 |
| commit | db1fd054d2d5e7243f91f38625307c83b1a91e0b (patch) | |
| tree | 24b85ed352a5b5bc02348038375a45d164bec120 | |
| parent | 2e7c67f3cd1c48f18fce32cf2a08287b2d5aa267 (diff) | |
| parent | 21984eeaf76bd72de7dc1ba614e25bea84910887 (diff) | |
| download | base-db1fd054d2d5e7243f91f38625307c83b1a91e0b.tar.gz | |
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index a43c398f04ad..d7518950df2f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -2102,7 +2102,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 130; + private static final int SETTINGS_VERSION = 131; private final int mUserId; @@ -2416,6 +2416,21 @@ public class SettingsProvider extends ContentProvider { 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) { Slog.wtf("SettingsProvider", "warning: upgrading settings database to version " + newVersion + " left it at " |