Merge "Feature flag for stopping restricted profiles" (8731a192) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>

+1 −0

Original line number	Diff line number	Diff line
		@@ -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,