From 41d20af6520e834fac8a29185eacabef653b0196 Mon Sep 17 00:00:00 2001 From: haiping Date: Sun, 9 May 2021 00:22:16 -0700 Subject: [PATCH] Add global settings keys for sysui package and main activity Test: manual Bug: 155178776 Change-Id: I86eff7004b141a394bc5bcf209f67e63676e0e4f --- core/java/android/provider/Settings.java | 16 ++++++++++++++++ .../provider/settings/backup/GlobalSettings.java | 2 ++ .../validators/GlobalSettingsValidators.java | 2 ++ 3 files changed, 20 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4735522dc2fd4..f30ecf7eecac1 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -14756,6 +14756,22 @@ public final class Settings { public static final String MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY = "max_sound_trigger_detection_service_ops_per_day"; + /** + * Setting indicating the name of the Wear OS app package containing the device's sysui. + * + * @hide + */ + public static final String CLOCKWORK_SYSUI_PACKAGE_NAME = + "clockwork_sysui_package_name"; + + /** + * Setting indicating the name of the main activity of the Wear OS sysui. + * + * @hide + */ + public static final String CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME = + "clockwork_sysui_main_activity_name"; + /** * Indicates whether aware is available in the current location. * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index b7560d207f0d7..6061e53f34b8d 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -40,6 +40,8 @@ public class GlobalSettings { public static final String[] SETTINGS_TO_BACKUP = { Settings.Global.APPLY_RAMPING_RINGER, Settings.Global.BUGREPORT_IN_POWER_MENU, + Settings.Global.CLOCKWORK_SYSUI_PACKAGE_NAME, + Settings.Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME, Settings.Global.STAY_ON_WHILE_PLUGGED_IN, Settings.Global.APP_AUTO_RESTRICTION_ENABLED, Settings.Global.AUTO_TIME, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 8f7f1faa4d91c..c3f3ea975ecc7 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -113,6 +113,8 @@ public class GlobalSettingsValidators { VALIDATORS.put( Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, PERCENTAGE_INTEGER_VALIDATOR); VALIDATORS.put(Global.BLUETOOTH_ON, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME, ANY_STRING_VALIDATOR); + VALIDATORS.put(Global.CLOCKWORK_SYSUI_PACKAGE_NAME, ANY_STRING_VALIDATOR); VALIDATORS.put(Global.PRIVATE_DNS_MODE, ANY_STRING_VALIDATOR); VALIDATORS.put(Global.PRIVATE_DNS_SPECIFIER, ANY_STRING_VALIDATOR); VALIDATORS.put(Global.SOFT_AP_TIMEOUT_ENABLED, BOOLEAN_VALIDATOR);