Merge "Remove sleep_timeout setting from backup" (c39a8ac6) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -7443,9 +7443,6 @@ public final class Settings {
		*/
		public static final String SLEEP_TIMEOUT = "sleep_timeout";

		private static final Validator SLEEP_TIMEOUT_VALIDATOR =
		new SettingsValidators.InclusiveIntegerRangeValidator(-1, Integer.MAX_VALUE);

		/**
		* Controls whether double tap to wake is enabled.
		* @hide
		@@ -8008,7 +8005,6 @@ public final class Settings {
		MOUNT_UMS_AUTOSTART,
		MOUNT_UMS_PROMPT,
		MOUNT_UMS_NOTIFY_ENABLED,
		SLEEP_TIMEOUT,
		DOUBLE_TAP_TO_WAKE,
		WAKE_GESTURE_ENABLED,
		LONG_PRESS_TIMEOUT,
		@@ -8136,7 +8132,6 @@ public final class Settings {
		VALIDATORS.put(MOUNT_UMS_AUTOSTART, MOUNT_UMS_AUTOSTART_VALIDATOR);
		VALIDATORS.put(MOUNT_UMS_PROMPT, MOUNT_UMS_PROMPT_VALIDATOR);
		VALIDATORS.put(MOUNT_UMS_NOTIFY_ENABLED, MOUNT_UMS_NOTIFY_ENABLED_VALIDATOR);
		VALIDATORS.put(SLEEP_TIMEOUT, SLEEP_TIMEOUT_VALIDATOR);
		VALIDATORS.put(DOUBLE_TAP_TO_WAKE, DOUBLE_TAP_TO_WAKE_VALIDATOR);
		VALIDATORS.put(WAKE_GESTURE_ENABLED, WAKE_GESTURE_ENABLED_VALIDATOR);
		VALIDATORS.put(LONG_PRESS_TIMEOUT, LONG_PRESS_TIMEOUT_VALIDATOR);

+1 −0

Original line number	Diff line number	Diff line
		@@ -600,6 +600,7 @@ public class SettingsBackupTest {
		Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, // candidate?
		Settings.Secure.SHOW_ROTATION_SUGGESTIONS,
		Settings.Secure.SKIP_FIRST_USE_HINTS, // candidate?
		Settings.Secure.SLEEP_TIMEOUT,
		Settings.Secure.SMS_DEFAULT_APPLICATION,
		Settings.Secure.THEME_MODE,
		Settings.Secure.TRUST_AGENTS_INITIALIZED,