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

Commit f152dcb4 authored by Josh Yang's avatar Josh Yang Committed by Android (Google) Code Review
Browse files

Merge "settings: create DISABLE_AOD_WHILE_PLUGGED"

parents 352d25ea 3b746758

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -18530,6 +18530,13 @@ public final class Settings { 
             * @hide

             */

            public static final int UPGRADE_DATA_MIGRATION_DONE = 2;









            /**









             * Whether to disable AOD while plugged.









             * (0 = false, 1 = true)









             * @hide









             */









            public static final String DISABLE_AOD_WHILE_PLUGGED = "disable_aod_while_plugged";









        }









    }

































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



+2
−1






























Original line number
Diff line number
Diff line







@@ -410,5 +410,6 @@ public class GlobalSettingsValidators {







                            String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_PENDING),









                            String.valueOf(Global.Wearable.UPGRADE_DATA_MIGRATION_DONE)









                        }));









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









    }









}
























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



+2
−1






























Original line number
Diff line number
Diff line







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







                    Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED,









                    Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE,









                    Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED,









                    Settings.Global.Wearable.SCREENSHOT_ENABLED);









                    Settings.Global.Wearable.SCREENSHOT_ENABLED,









                    Settings.Global.Wearable.DISABLE_AOD_WHILE_PLUGGED);



















    private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =









             newHashSet(