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

Commit 69c08bc0 authored by Niamh Walsh's avatar Niamh Walsh Committed by Android (Google) Code Review
Browse files

Merge "Mark System.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON as moved to secure... 

Merge "Mark System.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON as moved to secure then global" into main
parents 3f75d791 1b2ede01

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -4184,7 +4184,6 @@ public final class Settings { 
            MOVED_TO_SECURE.add(Secure.PARENTAL_CONTROL_REDIRECT_URL);

            MOVED_TO_SECURE.add(Secure.SETTINGS_CLASSNAME);

            MOVED_TO_SECURE.add(Secure.USE_GOOGLE_MAIL);

            MOVED_TO_SECURE.add(Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);

            MOVED_TO_SECURE.add(Secure.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY);

            MOVED_TO_SECURE.add(Secure.WIFI_NUM_OPEN_NETWORKS_KEPT);

            MOVED_TO_SECURE.add(Secure.WIFI_ON);
@@ -4223,6 +4222,7 @@ public final class Settings { 
            MOVED_TO_SECURE_THEN_GLOBAL.add(Global.USB_MASS_STORAGE_ENABLED);

            MOVED_TO_SECURE_THEN_GLOBAL.add(Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS);

            MOVED_TO_SECURE_THEN_GLOBAL.add(Global.WIFI_MAX_DHCP_RETRY_COUNT);

            MOVED_TO_SECURE_THEN_GLOBAL.add(Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);















            // these are moving directly from system to global















            MOVED_TO_GLOBAL.add(Settings.Global.AIRPLANE_MODE_ON);