diff options
| author | 2022-01-31 17:36:20 +0000 | |
|---|---|---|
| committer | 2022-01-31 17:36:20 +0000 | |
| commit | 30288f9eeb63843e1a5883c035e23bb27bc687dd (patch) | |
| tree | 964b8be11027bfd691976c05397993b5a9182ef0 | |
| parent | 09136f296beed736aba4e3ae9f5880f5c67cbe80 (diff) | |
| parent | 7c0a7b94d5703e8e8b5f63f45a6a3d8b7181340b (diff) | |
Merge "Add a feature flag for timeout to user 0 when docked."
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 842065a7d987..1997e91a579e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2612,6 +2612,10 @@ will be locked. --> <bool name="config_multiuserDelayUserDataLocking">false</bool> + <!-- Whether to automatically switch a non-primary user back to the primary user after a + timeout when the device is docked. --> + <bool name="config_enableTimeoutToUserZeroWhenDocked">false</bool> + <!-- Whether to only install system packages on a user if they're allowlisted for that user type. These are flags and can be freely combined. 0 - disable allowlist (install all system packages; no logging) diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 85eed85a9e70..1884467cdcac 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -465,6 +465,7 @@ <java-symbol type="integer" name="config_multiuserMaximumUsers" /> <java-symbol type="integer" name="config_multiuserMaxRunningUsers" /> <java-symbol type="bool" name="config_multiuserDelayUserDataLocking" /> + <java-symbol type="bool" name="config_enableTimeoutToUserZeroWhenDocked" /> <java-symbol type="integer" name="config_userTypePackageWhitelistMode"/> <java-symbol type="xml" name="config_user_types" /> <java-symbol type="integer" name="config_safe_media_volume_index" /> |