diff options
| author | 2018-01-30 22:10:33 +0000 | |
|---|---|---|
| committer | 2018-01-30 22:10:33 +0000 | |
| commit | 8731a192564367ef151a1c48a9163556dda7850b (patch) | |
| tree | cc516b7f0d23dec94467ab7a06856ad0e62d1d4c | |
| parent | c3ad975aa20e25507d157f2ddb7326b947aa87b9 (diff) | |
| parent | 81ad972f39a12ff0aa8351b6a43727ffb73c4685 (diff) | |
Merge "Feature flag for stopping restricted profiles"
| -rw-r--r-- | core/java/android/provider/Settings.java | 12 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2440b489f416..1f0d683192d5 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10520,6 +10520,18 @@ public final class Settings { public static final String NETWORK_WATCHLIST_ENABLED = "network_watchlist_enabled"; /** + * Flag to keep background restricted profiles running after exiting. If disabled, + * the restricted profile can be put into stopped state as soon as the user leaves it. + * Type: int (0 for false, 1 for true) + * + * Overridden by the system based on device information. If null, the value specified + * by {@code config_keepRestrictedProfilesInBackground} is used. + * + * @hide + */ + public static final String KEEP_PROFILE_IN_BACKGROUND = "keep_profile_in_background"; + + /** * Get the key that retrieves a bluetooth headset's priority. * @hide */ diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index a22ca8726dca..5a5f187fd707 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3266,4 +3266,6 @@ <string name="config_defaultAssistantAccessPackage" translatable="false">android.ext.services</string> <bool name="config_supportBluetoothPersistedState">true</bool> + + <bool name="config_keepRestrictedProfilesInBackground">true</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 09d3121dfa72..7c820b3a0763 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3240,4 +3240,6 @@ <java-symbol type="string" name="slices_permission_request" /> <java-symbol type="string" name="screenshot_edit" /> + + <java-symbol type="bool" name="config_keepRestrictedProfilesInBackground" /> </resources> diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 733f7a107fa8..0083b017033b 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -245,6 +245,7 @@ public class SettingsBackupTest { Settings.Global.INTENT_FIREWALL_UPDATE_CONTENT_URL, Settings.Global.INTENT_FIREWALL_UPDATE_METADATA_URL, Settings.Global.JOB_SCHEDULER_CONSTANTS, + Settings.Global.KEEP_PROFILE_IN_BACKGROUND, Settings.Global.LANG_ID_UPDATE_CONTENT_URL, Settings.Global.LANG_ID_UPDATE_METADATA_URL, Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS, |