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

Backup NETWORK_AVOID_BAD_WIFI setting.

Browse Source 
Add NETWORK_AVOID_BAD_WIFI to GlobalSettings allowlist and remove
from denylist in SettingsBackupTest.

Bug: 270097260
Test: atest SettingsBackupTest
Test: Manual test, confirm value restored after device reset and restore.
Change-Id: I1e0f41443bb12b7687e21e8b426c95b1a33b3fd9
(cherry picked from https://android-review.googlesource.com/q/commit:a05d73f35a2a2e2d71ee7a07f42420d23193f3c2)
Merged-In: I1e0f41443bb12b7687e21e8b426c95b1a33b3fd9
This commit is contained in:
Hansen Kurli
2023-03-09 09:55:40 +00:00
committed by Cherrypicker Worker
parent 36ba0fe1cb
commit c0e7e4169e
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java
View File

@@ -49,6 +49,7 @@ public class GlobalSettings {
Settings.Global.CHARGING_SOUNDS_ENABLED, Settings.Global.CHARGING_SOUNDS_ENABLED,
Settings.Global.USB_MASS_STORAGE_ENABLED, Settings.Global.USB_MASS_STORAGE_ENABLED,
Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED,
Settings.Global.NETWORK_AVOID_BAD_WIFI,
Settings.Global.WIFI_WAKEUP_ENABLED, Settings.Global.WIFI_WAKEUP_ENABLED,
Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
Settings.Global.USE_OPEN_WIFI_PACKAGE, Settings.Global.USE_OPEN_WIFI_PACKAGE,

12
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -17,6 +17,9 @@
package android.provider.settings.validators; package android.provider.settings.validators;
import static android.media.AudioFormat.SURROUND_SOUND_ENCODING; import static android.media.AudioFormat.SURROUND_SOUND_ENCODING;
import static android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI_AVOID;
import static android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI_IGNORE;
import static android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI_PROMPT;
import static android.provider.settings.validators.SettingsValidators.ANY_INTEGER_VALIDATOR; import static android.provider.settings.validators.SettingsValidators.ANY_INTEGER_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.ANY_STRING_VALIDATOR; import static android.provider.settings.validators.SettingsValidators.ANY_STRING_VALIDATOR;
import static android.provider.settings.validators.SettingsValidators.BOOLEAN_VALIDATOR; import static android.provider.settings.validators.SettingsValidators.BOOLEAN_VALIDATOR;
@@ -95,6 +98,14 @@ public class GlobalSettingsValidators {
VALIDATORS.put( VALIDATORS.put(
Global.NETWORK_RECOMMENDATIONS_ENABLED, Global.NETWORK_RECOMMENDATIONS_ENABLED,
new DiscreteValueValidator(new String[] {"-1", "0", "1"})); new DiscreteValueValidator(new String[] {"-1", "0", "1"}));
VALIDATORS.put(
Global.NETWORK_AVOID_BAD_WIFI,
new DiscreteValueValidator(
new String[] {
String.valueOf(NETWORK_AVOID_BAD_WIFI_IGNORE),
String.valueOf(NETWORK_AVOID_BAD_WIFI_PROMPT),
String.valueOf(NETWORK_AVOID_BAD_WIFI_AVOID),
}));
VALIDATORS.put(Global.WIFI_WAKEUP_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.WIFI_WAKEUP_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, BOOLEAN_VALIDATOR);
VALIDATORS.put( VALIDATORS.put(
@@ -339,4 +350,3 @@ public class GlobalSettingsValidators {
VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR);
} }
} }

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -377,7 +377,6 @@ public class SettingsBackupTest {
Settings.Global.NETPOLICY_QUOTA_FRAC_JOBS, Settings.Global.NETPOLICY_QUOTA_FRAC_JOBS,
Settings.Global.NETPOLICY_QUOTA_FRAC_MULTIPATH, Settings.Global.NETPOLICY_QUOTA_FRAC_MULTIPATH,
Settings.Global.NETPOLICY_OVERRIDE_ENABLED, Settings.Global.NETPOLICY_OVERRIDE_ENABLED,
Settings.Global.NETWORK_AVOID_BAD_WIFI,
Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES, Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES,
Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE, Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE,
Settings.Global.NETWORK_WATCHLIST_LAST_REPORT_TIME, Settings.Global.NETWORK_WATCHLIST_LAST_REPORT_TIME,