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

Commit a933cf1b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a new setting that saves if auto-resume timeout is set by user."

parents 443177b4 f650f054

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -16987,6 +16987,14 @@ public final class Settings { 
            public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS =

                    "wear_activity_auto_resume_timeout_ms";













            /**













             * If the current {@code WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS} value is set by user.













             * 1 for true, 0 for false.













             * @hide













             */













            public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER =













                    "wear_activity_auto_resume_timeout_set_by_user";



























            /**















             * If burn in protection is enabled.















             * @hide

























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -655,7 +655,8 @@ public class SettingsBackupTest {













                    Settings.Global.Wearable.BURN_IN_PROTECTION_ENABLED,















                    Settings.Global.Wearable.WRIST_ORIENTATION_MODE,















                    Settings.Global.Wearable.CLOCKWORK_SYSUI_PACKAGE,













                    Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY);













                    Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY,













                    Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER);































    private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =















             newHashSet(