Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef3f7d53 authored May 24, 2022 by TreeHugger Robot Committed by Android (Google) Code Review May 24, 2022

Merge "Add a setting WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT"

parents efad7f40 ae445b4c

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -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

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(