diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2440b489f4162..1f0d683192d5c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10519,6 +10519,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 a22ca8726dcae..5a5f187fd707c 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3266,4 +3266,6 @@ android.ext.services true + + true diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 09d3121dfa723..7c820b3a07630 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3240,4 +3240,6 @@ + + diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 733f7a107fa87..0083b017033bc 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,