diff options
| author | Beth Thibodeau <ethibodeau@google.com> | 2020-08-18 14:39:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 14:39:26 +0000 |
| commit | 865643a12dbc491818be219936cdb255ea04ff5d (patch) | |
| tree | 03c92b4ecb69be7d4ae2e8277c95ac67509d0e32 /packages/SettingsProvider | |
| parent | f1d48ccdeba0bd811ce093418c3c02af13b952bd (diff) | |
| parent | 3743d5526ac7a43d486a109b521dafa7a8a87874 (diff) | |
Merge "Allow user to block individual apps from resuming" into rvc-qpr-dev am: 3743d5526a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12391748
Change-Id: Ief6bfded76c4fe6d1636f9af1c67659b2b84ab63
Diffstat (limited to 'packages/SettingsProvider')
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index d05e6e16bc1a..0977799a6976 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -165,6 +165,7 @@ public class SecureSettings { Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT, Settings.Secure.PEOPLE_STRIP, Settings.Secure.MEDIA_CONTROLS_RESUME, + Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE, Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS }; diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index fa810bdf3a4e..c62fdc6a2780 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -244,6 +244,8 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.TAP_GESTURE, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.PEOPLE_STRIP, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.MEDIA_CONTROLS_RESUME, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.MEDIA_CONTROLS_RESUME_BLOCKED, + COLON_SEPARATED_PACKAGE_LIST_VALIDATOR); VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_MODE, new InclusiveIntegerRangeValidator( Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN, |