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

Commit 7084521a authored by Al Sutton's avatar Al Sutton Committed by Android (Google) Code Review
Browse files

Merge "Allow Developer Menu state to be migrated"

parents 963c5ac7 0c99455b

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

+1 −0
Original line number Diff line number Diff line
@@ -72,5 +72,6 @@ public class GlobalSettings { 
        Settings.Global.NOTIFICATION_BUBBLES,

        Settings.Global.CUSTOM_BUGREPORT_HANDLER_APP,

        Settings.Global.CUSTOM_BUGREPORT_HANDLER_USER,

        Settings.Global.DEVELOPMENT_SETTINGS_ENABLED

    };

}

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

+1 −0
Original line number Diff line number Diff line
@@ -151,5 +151,6 @@ public class GlobalSettingsValidators { 
        VALIDATORS.put(Global.NOTIFICATION_BUBBLES, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.CUSTOM_BUGREPORT_HANDLER_APP, ANY_STRING_VALIDATOR);

        VALIDATORS.put(Global.CUSTOM_BUGREPORT_HANDLER_USER, ANY_INTEGER_VALIDATOR);

        VALIDATORS.put(Global.DEVELOPMENT_SETTINGS_ENABLED, BOOLEAN_VALIDATOR);

    }

}

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

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

                    Settings.Global.DEVELOPMENT_FORCE_RTL,

                    Settings.Global.DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM,

                    Settings.Global.DEVELOPMENT_SETTINGS_ENABLED,

                    Settings.Global.DEVICE_DEMO_MODE,

                    Settings.Global.DEVICE_IDLE_CONSTANTS,

                    Settings.Global.BATTERY_SAVER_ADAPTIVE_CONSTANTS,