diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e95d9c7d9d1c2..34b50d12aa9da 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17567,6 +17567,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 751ffe15e0744..abd46dfc28be4 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -316,6 +316,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 83444d5df256e..f62daa3cb73bb 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -655,7 +655,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(