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

Commit 94e91ddd authored by Kyle Holm's avatar Kyle Holm Committed by Android (Google) Code Review
Browse files

Merge "[Wear PAS] Add Setting for if PAS is enabled" into main

parents 24647228 6f95d6e6

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -19175,6 +19175,14 @@ public final class Settings { 
             * @hide

             */

            public static final String WEAR_LAUNCHER_UI_MODE = "wear_launcher_ui_mode";













            /** Whether Wear Power Anomaly Service is enabled.













             *













             * (0 = false, 1 = true)













             * @hide













             */













            public static final String WEAR_POWER_ANOMALY_SERVICE_ENABLED =













                    "wear_power_anomaly_service_enabled";















        }















    }







































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



+1
−0




























Original line number
Diff line number
Diff line








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













                        }));















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















        VALIDATORS.put(Global.Wearable.WEAR_LAUNCHER_UI_MODE, NON_NEGATIVE_INTEGER_VALIDATOR);













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















    }















}
























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



+2
−1




























Original line number
Diff line number
Diff line








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













                    Settings.Global.Wearable.TETHER_CONFIG_STATE,















                    Settings.Global.Wearable.PHONE_SWITCHING_SUPPORTED,















                    Settings.Global.Wearable.WEAR_MEDIA_CONTROLS_PACKAGE,













                    Settings.Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE);













                    Settings.Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE,













                    Settings.Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED);































    private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =















             newHashSet(