From 8636796f421b0ada77510b3063ba6cc5f2ab0aa2 Mon Sep 17 00:00:00 2001 From: Amin Shaikh Date: Wed, 7 Jun 2017 08:58:22 -0700 Subject: [PATCH] Update wifi_wakeup_available default setting. Users who flashed builds in the 6 days window between the merging of ag/2209963 and ag/2209965 have their WIFI_WAKEUP_AVAILABLE set to 0. This change ensures that all users have the correct default value set for this setting. Bug: 62395317 Test: runtest --path frameworks/base/core/tests/coretests/src/android/provider/SettingsProviderTest.java Change-Id: I7e733c9dee0c94b9fe591135e89a621676ba942e --- .../providers/settings/SettingsProvider.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 455d9cb871c4c..2e974061ef615 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -2899,7 +2899,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 145; + private static final int SETTINGS_VERSION = 146; private final int mUserId; @@ -3482,22 +3482,25 @@ public class SettingsProvider extends ContentProvider { } if (currentVersion == 144) { - // Version 145: Set the default value for WIFI_WAKEUP_AVAILABLE. + // Version 145: Removed + currentVersion = 145; + } + + if (currentVersion == 145) { + // Version 146: Set the default value for WIFI_WAKEUP_AVAILABLE. if (userId == UserHandle.USER_SYSTEM) { final SettingsState globalSettings = getGlobalSettingsLocked(); final Setting currentSetting = globalSettings.getSettingLocked( Settings.Global.WIFI_WAKEUP_AVAILABLE); - if (currentSetting.isNull()) { - final int defaultValue = getContext().getResources().getInteger( - com.android.internal.R.integer.config_wifi_wakeup_available); - globalSettings.insertSettingLocked( - Settings.Global.WIFI_WAKEUP_AVAILABLE, - String.valueOf(defaultValue), - null, true, SettingsState.SYSTEM_PACKAGE_NAME); - } + final int defaultValue = getContext().getResources().getInteger( + com.android.internal.R.integer.config_wifi_wakeup_available); + globalSettings.insertSettingLocked( + Settings.Global.WIFI_WAKEUP_AVAILABLE, + String.valueOf(defaultValue), + null, true, SettingsState.SYSTEM_PACKAGE_NAME); } - currentVersion = 145; + currentVersion = 146; } // vXXX: Add new settings above this point.