Always show wifi wake setting.
Remove WIFI_WAKEUP_AVAILABLE config setting its available by default.
Remove check for NETWORK_RECOMMENDATIONS_ENABLED, the feature no longer
uses the recommender.
Test: make RunSettingsRoboTests RunSettingsLibRoboTests;
Test: atest SettingsBackupTest; manual/exploratory
Bug: 69624403
Bug: 67952636
Change-Id: I9e287b79d0da01bab00ed81295dcc1f266ca0851
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index d1459bb..81aaaea 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3015,7 +3015,7 @@
}
private final class UpgradeController {
- private static final int SETTINGS_VERSION = 152;
+ private static final int SETTINGS_VERSION = 153;
private final int mUserId;
@@ -3540,21 +3540,9 @@
}
if (currentVersion == 146) {
- // Version 147: 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.getValue() == null) {
- 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);
- }
- }
-
+ // Version 147: Removed. (This version previously allowed showing the
+ // "wifi_wakeup_available" setting).
+ // The setting that was added here is deleted in 153.
currentVersion = 147;
}
@@ -3621,18 +3609,17 @@
}
if (currentVersion == 151) {
- // Version 152: Reset wifi wake available for upgrading users
- final SettingsState globalSettings = getGlobalSettingsLocked();
- 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);
-
+ // Version 152: Removed. (This version made the setting for wifi_wakeup enabled
+ // by default but it is now no longer configurable).
+ // The setting updated here is deleted in 153.
currentVersion = 152;
}
+ if (currentVersion == 152) {
+ getGlobalSettingsLocked().deleteSettingLocked("wifi_wakeup_available");
+ currentVersion = 153;
+ }
+
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {