From 05a7bdd7f619fce0a95cfbe975a887763a3ca479 Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Mon, 15 Nov 2021 18:18:45 -0800 Subject: [PATCH] Remove redundant settings. Test: build success Change-Id: I68f32be17acdb542d28cc9e9df52f9b55844b2f9 --- core/java/android/provider/Settings.java | 16 ---------------- .../provider/settings/backup/GlobalSettings.java | 3 --- .../validators/GlobalSettingsValidators.java | 2 -- .../src/android/provider/SettingsBackupTest.java | 1 + 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e226fa1e30a74..a7ba8cc1f34c8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -15054,22 +15054,6 @@ 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"; - /** * Setting to determine if the Clockwork Home application is ready. * diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index 6f42d59cca189..a50d4ae16c99a 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -40,9 +40,6 @@ 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.CLOCKWORK_HOME_READY, 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 2bd5bdc1e7a3d..bf62f1dfb75ba 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -116,8 +116,6 @@ 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.CLOCKWORK_HOME_READY, ANY_STRING_VALIDATOR); VALIDATORS.put(Global.ENABLE_TARE, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.ENABLE_TARE_ALARM_MANAGER, BOOLEAN_VALIDATOR); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 189004cc21642..182cce775ffc5 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -592,6 +592,7 @@ public class SettingsBackupTest { Settings.Global.CACHED_APPS_FREEZER_ENABLED, Settings.Global.APP_INTEGRITY_VERIFICATION_TIMEOUT, Settings.Global.KEY_CHORD_POWER_VOLUME_UP, + Settings.Global.CLOCKWORK_HOME_READY, Settings.Global.Wearable.BATTERY_SAVER_MODE, Settings.Global.Wearable.COMBINED_LOCATION_ENABLED, Settings.Global.Wearable.HAS_PAY_TOKENS,