From 6f95d6e6f7d349803ddbb85202b33da45f7b13cc Mon Sep 17 00:00:00 2001 From: Kyle Holm Date: Tue, 16 May 2023 17:37:29 -0700 Subject: [Wear PAS] Add Setting for if PAS is enabled Skip-CP-To-Master: this setting will be used only while phenotype is unavailable. We should not need this setting after moving from T. Bug: 280889422 Test: Built and flashed. Verified in logs that toggling the option triggered an attempt to schedule the monitor job. Verified that PAS was correspondigly enabled/disabled. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:15eab7a0a9110587104d71fc81bd6d68e315be2b) Change-Id: I0e52aac7a64f79cf068eabcbad5dfd7bd13c2a0f --- core/java/android/provider/Settings.java | 8 ++++++++ .../provider/settings/validators/GlobalSettingsValidators.java | 1 + .../test/src/android/provider/SettingsBackupTest.java | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2abf02ec3ed3..bf58eaa47e83 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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"; } } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 46e73d096c0b..58106c05affa 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -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); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 9c9dd8a6c39e..61afb5b84247 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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 BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet( -- cgit v1.2.3-59-g8ed1b