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

Commit 60bd06f1 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Add B&R for Users settings preferences" into main

parents 5753734f 02e56f9c

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

+3 −0
Original line number Diff line number Diff line
@@ -122,5 +122,8 @@ public class GlobalSettings { 
        Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED,

        Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE,

        Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED,

        Settings.Global.ADD_USERS_WHEN_LOCKED,

        Settings.Global.REMOVE_GUEST_ON_EXIT,

        Settings.Global.USER_SWITCHER_ENABLED,

    };

}

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

+3 −0
Original line number Diff line number Diff line
@@ -453,5 +453,8 @@ public class GlobalSettingsValidators { 
                Global.Wearable.CONSISTENT_NOTIFICATION_BLOCKING_ENABLED, ANY_INTEGER_VALIDATOR);

        VALIDATORS.put(Global.Wearable.AUTO_BEDTIME_MODE, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.FORCE_ENABLE_PSS_PROFILING, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.ADD_USERS_WHEN_LOCKED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.REMOVE_GUEST_ON_EXIT, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.USER_SWITCHER_ENABLED, BOOLEAN_VALIDATOR);

    }

}

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

+0 −3
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ public class SettingsBackupTest { 
                    Settings.Global.ADB_ENABLED,

                    Settings.Global.ADB_WIFI_ENABLED,

                    Settings.Global.ADB_DISCONNECT_SESSIONS_ON_REVOKE,

                    Settings.Global.ADD_USERS_WHEN_LOCKED,

                    Settings.Global.AIRPLANE_MODE_ON,

                    Settings.Global.AIRPLANE_MODE_RADIOS,

                    Settings.Global.ALLOW_WORK_PROFILE_TELEPHONY_FOR_NON_DPM_ROLE_HOLDERS,
@@ -381,7 +380,6 @@ public class SettingsBackupTest { 
                    Settings.Global.RADIO_WIFI,

                    Settings.Global.RADIO_WIMAX,

                    Settings.Global.RADIO_UWB,

                    Settings.Global.REMOVE_GUEST_ON_EXIT,

                    Settings.Global.RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS,

                    Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT,

                    Settings.Global.RESTRICTED_NETWORKING_MODE,
@@ -485,7 +483,6 @@ public class SettingsBackupTest { 
                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,

                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,

                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS,

                    Settings.Global.USER_SWITCHER_ENABLED,

                    Settings.Global.WARNING_TEMPERATURE,

                    Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY,

                    Settings.Global.WEBVIEW_MULTIPROCESS,