diff options
| author | Adrian Roos <roosa@google.com> | 2016-10-21 14:49:17 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2016-10-25 19:40:34 +0000 |
| commit | 21984eeaf76bd72de7dc1ba614e25bea84910887 (patch) | |
| tree | e4c8b887fe910395b6a8a4d2fbf6361ddd5466c3 | |
| parent | 92bd012829e57c5ac0560a6bdd4ef0776125de90 (diff) | |
| download | base-21984eeaf76bd72de7dc1ba614e25bea84910887.tar.gz | |
Ambient: If user turned off ambient, keep it off after split
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: Id80d62727952f63b363f87c19b5befbde8ab5c31
Merged-In: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Merged-In: I346a53b0dc9cdf578c238113f4f33056ba0f3aea
Fixes: 32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
| -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 " |