From 63b93200a298e24f0b274f819db250133c2e3aea Mon Sep 17 00:00:00 2001 From: Bagus Maulana Date: Fri, 6 May 2022 14:33:04 +0100 Subject: [PATCH] Backup ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER See b/222260820#comment27 for context. Bug: 228159084 Test: flashed to watch, manually tested backup & restore Change-Id: I70b5cc465f12551494cb32b20517ab19715ecf30 (cherry picked from commit 674d1559ec445bf2d4cdbd17b7894f00ab8deee6) (cherry picked from commit 5923b2394d3c765a5d4149941a5d7c50ab16f029) --- .../src/android/provider/settings/backup/GlobalSettings.java | 3 ++- .../provider/settings/validators/GlobalSettingsValidators.java | 3 +++ .../test/src/android/provider/SettingsBackupTest.java | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index 428a65534f48c..b9e565e9a78e7 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -93,6 +93,7 @@ public class GlobalSettings { Settings.Global.Wearable.AMBIENT_TOUCH_TO_WAKE, Settings.Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE, Settings.Global.Wearable.BATTERY_SAVER_MODE, - Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS + Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS, + Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 98e47785ab1ba..0584406ea8f7e 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -307,6 +307,9 @@ public class GlobalSettingsValidators { VALIDATORS.put( Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS, NON_NEGATIVE_INTEGER_VALIDATOR); + VALIDATORS.put( + Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER, + BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.BURN_IN_PROTECTION_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.COMBINED_LOCATION_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.WRIST_ORIENTATION_MODE, diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index a4f469d1fbae7..031292e49ce7e 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -652,7 +652,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.CLOCKWORK_SYSUI_PACKAGE, Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY, Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED, - Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER, Settings.Global.Wearable.WET_MODE_ON, Settings.Global.Wearable.COOLDOWN_MODE_ON, Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,