Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a new setting that saves if auto-resume timeout is set by user."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-08 20:56:13 +00:00
committed by Android (Google) Code Review
parent 443177b45c f650f054b0
commit a933cf1b94
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -16987,6 +16987,14 @@ public final class Settings {
public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS =
"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

3
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -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(