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

Merge "Add a setting WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-24 05:45:55 +00:00
committed by Android (Google) Code Review
parent efad7f40ef ae445b4c4f
commit ef3f7d5321
3 changed files with 13 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

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

3
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -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);
}
}

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

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