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

Commit 31c8327e authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Back up and restore Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS." into main

parents 7b1ad58e 4df38aa2

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

+2 −1
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ public class SecureSettings { 
        Settings.Secure.EVEN_DIMMER_MIN_NITS,

        Settings.Secure.STYLUS_POINTER_ICON_ENABLED,

        Settings.Secure.CAMERA_EXTENSIONS_FALLBACK,

        Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED

        Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED,

        Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS

    };

}

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

+1 −0
Original line number Diff line number Diff line
@@ -423,5 +423,6 @@ public class SecureSettingsValidators { 
        VALIDATORS.put(Secure.AUTOFILL_SERVICE, AUTOFILL_SERVICE_VALIDATOR);

        VALIDATORS.put(Secure.STYLUS_POINTER_ICON_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.CAMERA_EXTENSIONS_FALLBACK, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.IMMERSIVE_MODE_CONFIRMATIONS, ANY_STRING_VALIDATOR);

    }

}

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

+0 −1
Original line number Diff line number Diff line
@@ -702,7 +702,6 @@ public class SettingsBackupTest { 
                 Settings.Secure.ENABLED_PRINT_SERVICES,

                 Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE,

                 Settings.Secure.GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED,

                 Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,

                 Settings.Secure.INCALL_BACK_BUTTON_BEHAVIOR,

                 Settings.Secure.INPUT_METHOD_SELECTOR_VISIBILITY,

                 Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY,