Merge "Add a new setting key APP_FUNCTION_AGENT_ALLOWLIST_ENABLED" into main (8f4ef4a7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -8817,6 +8817,19 @@ public final class Settings {
		public static final String SUGGESTED_THEME_FEATURE_ENABLED =
		"suggested_theme_feature_enabled";

		/**
		* Setting to indicate whether the AppFunction agent allowlist should be enabled.
		*
		* <ul>
		* <li>0 = Off
		* <li>1 = Enabled (Default)
		* </ul>
		*
		* @hide
		*/
		public static final String APP_FUNCTION_AGENT_ALLOWLIST_ENABLED =
		"app_function_agent_allowlist_enabled";

		/**
		* Set by the system to track if the user needs to see the call to action for
		* the lockscreen notification policy.

+1 −0

Original line number	Diff line number	Diff line
		@@ -512,5 +512,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.SUGGESTED_THEME_FEATURE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.HDR_BRIGHTNESS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.HDR_BRIGHTNESS_BOOST_LEVEL, new InclusiveFloatRangeValidator(0, 1));
		VALIDATORS.put(Secure.APP_FUNCTION_AGENT_ALLOWLIST_ENABLED, BOOLEAN_VALIDATOR);
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -813,7 +813,8 @@ public class SettingsBackupTest {
		Settings.Secure.PACK_THEME_FEATURE_ENABLED,
		Settings.Secure.SUGGESTED_THEME_FEATURE_ENABLED,
		Settings.Secure.REDACT_OTP_NOTIFICATION_WHILE_CONNECTED_TO_WIFI,
		Settings.Secure.OTP_NOTIFICATION_REDACTION_LOCK_TIME);
		Settings.Secure.OTP_NOTIFICATION_REDACTION_LOCK_TIME,
		Settings.Secure.APP_FUNCTION_AGENT_ALLOWLIST_ENABLED);

		@Test
		public void systemSettingsBackedUpOrDenied() {