diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 539ce71d62b3d..d30f9aad53bd7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17579,6 +17579,14 @@ public final class Settings { public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER = "wear_activity_auto_resume_timeout_set_by_user"; + /** + * The maximum times that we are allowed to reset the activity auto-resume timeout + * timer. + * @hide + */ + public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT = + "wear_activity_auto_resume_timeout_max_reset_count"; + /** * If burn in protection is enabled. * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 7f29c2c95e7ed..5ab2becc33010 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -323,6 +323,9 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR); + VALIDATORS.put( + Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT, + NON_NEGATIVE_INTEGER_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 27fc97d56d7fe..eec566ca2fbe7 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -656,7 +656,8 @@ public class SettingsBackupTest { Settings.Global.Wearable.COOLDOWN_MODE_ON, Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED, Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, - Settings.Global.Wearable.BEDTIME_MODE); + Settings.Global.Wearable.BEDTIME_MODE, + Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet(