Merge "Migrate compat mode allowed list to DeviceConfig" (ba6aaaef) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10016,7 +10016,7 @@ package android.provider {
	method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);
	field public static final String AIRPLANE_MODE_TOGGLEABLE_RADIOS = "airplane_mode_toggleable_radios";		field public static final String AIRPLANE_MODE_TOGGLEABLE_RADIOS = "airplane_mode_toggleable_radios";
	field public static final String APP_STANDBY_ENABLED = "app_standby_enabled";		field public static final String APP_STANDBY_ENABLED = "app_standby_enabled";
	field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";		field @Deprecated public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
	field public static final String CARRIER_APP_NAMES = "carrier_app_names";		field public static final String CARRIER_APP_NAMES = "carrier_app_names";
	field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";		field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";
	field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";		field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";

core/api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2877,6 +2877,7 @@ package android.view.autofill {
	}		}

	public final class AutofillManager {		public final class AutofillManager {
			field public static final String DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "compat_mode_allowed_packages";
	field public static final String DEVICE_CONFIG_AUTOFILL_SMART_SUGGESTION_SUPPORTED_MODES = "smart_suggestion_supported_modes";		field public static final String DEVICE_CONFIG_AUTOFILL_SMART_SUGGESTION_SUPPORTED_MODES = "smart_suggestion_supported_modes";
	field public static final int FLAG_SMART_SUGGESTION_OFF = 0; // 0x0		field public static final int FLAG_SMART_SUGGESTION_OFF = 0; // 0x0
	field public static final int FLAG_SMART_SUGGESTION_SYSTEM = 1; // 0x1		field public static final int FLAG_SMART_SUGGESTION_SYSTEM = 1; // 0x1

core/java/android/provider/Settings.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15216,7 +15216,10 @@ public final class Settings {
	* {@code p1[url_bar]:p2:p3[url_foo,url_bas]}		* {@code p1[url_bar]:p2:p3[url_foo,url_bas]}
	*		*
	* @hide		* @hide
			* @deprecated Use {@link android.view.autofill.AutofillManager
			* #DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES} instead.
	*/		*/
			@Deprecated
	@SystemApi		@SystemApi
	@Readable		@Readable
	public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES =		public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES =

core/java/android/view/autofill/AutofillManager.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -472,6 +472,24 @@ public final class AutofillManager {
	public static final String DEVICE_CONFIG_AUGMENTED_SERVICE_REQUEST_TIMEOUT =		public static final String DEVICE_CONFIG_AUGMENTED_SERVICE_REQUEST_TIMEOUT =
	"augmented_service_request_timeout";		"augmented_service_request_timeout";

			/**
			* Sets allowed list for the autofill compatibility mode.
			*
			* The list of packages is {@code ":"} colon delimited, and each entry has the name of the
			* package and an optional list of url bar resource ids (the list is delimited by
			* brackets&mdash{@code [} and {@code ]}&mdash and is also comma delimited).
			*
			* <p>For example, a list with 3 packages {@code p1}, {@code p2}, and {@code p3}, where
			* package {@code p1} have one id ({@code url_bar}, {@code p2} has none, and {@code p3 }
			* have 2 ids {@code url_foo} and {@code url_bas}) would be
			* {@code p1[url_bar]:p2:p3[url_foo,url_bas]}
			*
			* @hide
			*/
			@TestApi
			public static final String DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES =
			"compat_mode_allowed_packages";

	/** @hide */		/** @hide */
	public static final int RESULT_OK = 0;		public static final int RESULT_OK = 0;
	/** @hide */		/** @hide */

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -243,9 +243,6 @@ class SettingsProtoDumpUtil {
	GlobalSettingsProto.AUDIO_SAFE_VOLUME_STATE);		GlobalSettingsProto.AUDIO_SAFE_VOLUME_STATE);

	final long autofillToken = p.start(GlobalSettingsProto.AUTOFILL);		final long autofillToken = p.start(GlobalSettingsProto.AUTOFILL);
	dumpSetting(s, p,
	Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
	GlobalSettingsProto.Autofill.COMPAT_MODE_ALLOWED_PACKAGES);
	dumpSetting(s, p,		dumpSetting(s, p,
	Settings.Global.AUTOFILL_LOGGING_LEVEL,		Settings.Global.AUTOFILL_LOGGING_LEVEL,
	GlobalSettingsProto.Autofill.LOGGING_LEVEL);		GlobalSettingsProto.Autofill.LOGGING_LEVEL);