Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b8deec authored by Hansen Kurli's avatar Hansen Kurli Committed by Automerger Merge Worker
Browse files

Merge "Backup NETWORK_AVOID_BAD_WIFI setting." am: 519dbb2d am: 6856af76 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2479675



Change-Id: I086ce4418d958c6a7ff4281d1d1780f10421904c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 326d580b 6856af76

packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ public class GlobalSettings { 
        Settings.Global.CHARGING_SOUNDS_ENABLED,

        Settings.Global.USB_MASS_STORAGE_ENABLED,

        Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED,

        Settings.Global.NETWORK_AVOID_BAD_WIFI,

        Settings.Global.WIFI_WAKEUP_ENABLED,

        Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,

        Settings.Global.USE_OPEN_WIFI_PACKAGE,

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+11 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
package android.provider.settings.validators;



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_STRING_VALIDATOR;

import static android.provider.settings.validators.SettingsValidators.BOOLEAN_VALIDATOR;
@@ -95,6 +98,14 @@ public class GlobalSettingsValidators { 
        VALIDATORS.put(

                Global.NETWORK_RECOMMENDATIONS_ENABLED,

                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_NETWORKS_AVAILABLE_NOTIFICATION_ON, BOOLEAN_VALIDATOR);

        VALIDATORS.put(
@@ -339,4 +350,3 @@ public class GlobalSettingsValidators { 
        VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR);

    }

}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ public class SettingsBackupTest { 
                    Settings.Global.NETPOLICY_QUOTA_FRAC_JOBS,

                    Settings.Global.NETPOLICY_QUOTA_FRAC_MULTIPATH,

                    Settings.Global.NETPOLICY_OVERRIDE_ENABLED,

                    Settings.Global.NETWORK_AVOID_BAD_WIFI,

                    Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES,

                    Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE,

                    Settings.Global.NETWORK_WATCHLIST_LAST_REPORT_TIME,