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

Commit 25e333cb authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "Add VR_DISPLAY_MODE settings to be backed up."

parents a485f71f 5bce494b

core/java/android/provider/Settings.java

+2 −1
Original line number Diff line number Diff line
@@ -6998,7 +6998,8 @@ public final class Settings { 
            DOZE_PULSE_ON_DOUBLE_TAP,

            NFC_PAYMENT_DEFAULT_COMPONENT,

            AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,

            ASSIST_GESTURE_ENABLED

            ASSIST_GESTURE_ENABLED,

            VR_DISPLAY_MODE

        };



        /**

core/tests/coretests/src/android/provider/SettingsBackupTest.java

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

                 Settings.Secure.VOICE_INTERACTION_SERVICE,

                 Settings.Secure.VOICE_RECOGNITION_SERVICE,

                 Settings.Secure.VR_DISPLAY_MODE, // Candidate?

                 Settings.Secure.WEB_ACTION_ENABLED);



    @Test