diff options
| author | 2021-12-07 14:49:30 -0800 | |
|---|---|---|
| committer | 2021-12-07 23:06:14 +0000 | |
| commit | f650f054b0756c055a2bf048dbb7427518ffbd8d (patch) | |
| tree | 32d3973987f4267188a1440191515925f542b02f | |
| parent | d0da7efa7e91b5cca79d3d31de2ea81207e98645 (diff) | |
Add a new setting that saves if auto-resume timeout is set by user.
Bug: 209668714
Test: manually tested
Change-Id: I9a0fa8f18a250ee3a82966ff5a4403479ea9f614
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 49a211f08bde..f5bcb54bf2ee 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16988,6 +16988,14 @@ public final class Settings { "wear_activity_auto_resume_timeout_ms"; /** + * If the current {@code WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS} value is set by user. + * 1 for true, 0 for false. + * @hide + */ + public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER = + "wear_activity_auto_resume_timeout_set_by_user"; + + /** * If burn in protection is enabled. * @hide */ diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index f0f2c0fef65c..fb8ffbd476a6 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.BURN_IN_PROTECTION_ENABLED, Settings.Global.Wearable.WRIST_ORIENTATION_MODE, Settings.Global.Wearable.CLOCKWORK_SYSUI_PACKAGE, - Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY); + Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY, + Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER); private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet( |