Remove sleep_timeout setting from backup
It is not user-configurable.
Bug: 79779285
Test: atest SettingsBackupTest
Test: # w/ LocalTransport
adb shell settings put secure sleep_timeout 5000
adb shell bmgr backupnow com.android.providers.settings
adb shell settings put secure sleep_timeout 3000
adb shell bmgr restore 1 com.android.providers.settings
adb shell settings get secure sleep_timeout => ensure 3000
Change-Id: I68bf2f91cc3d4c00463468a6abaef3b64d5c10b9
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4534f48..1794b47 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7442,9 +7442,6 @@
*/
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
@@ -8007,7 +8004,6 @@
MOUNT_UMS_AUTOSTART,
MOUNT_UMS_PROMPT,
MOUNT_UMS_NOTIFY_ENABLED,
- SLEEP_TIMEOUT,
DOUBLE_TAP_TO_WAKE,
WAKE_GESTURE_ENABLED,
LONG_PRESS_TIMEOUT,
@@ -8135,7 +8131,6 @@
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);
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 14c641a..8c16d83 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -595,6 +595,7 @@
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,