Merge "[Autofill] Address API feedback" into main (998e7bd5) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -41045,7 +41045,7 @@ package android.service.autofill {
		field public static final int TYPE_DATASET_SELECTED = 0; // 0x0
		field public static final int TYPE_SAVE_SHOWN = 3; // 0x3
		field public static final int TYPE_VIEW_REQUESTED_AUTOFILL = 6; // 0x6
		field @FlaggedApi("android.service.autofill.autofill_w_metrics") public static final int UI_TYPE_CREDMAN = 4; // 0x4
		field @FlaggedApi("android.service.autofill.autofill_w_metrics") public static final int UI_TYPE_CREDENTIAL_MANAGER = 4; // 0x4
		field public static final int UI_TYPE_DIALOG = 3; // 0x3
		field public static final int UI_TYPE_INLINE = 2; // 0x2
		field public static final int UI_TYPE_MENU = 1; // 0x1
		@@ -55247,8 +55247,8 @@ package android.view {
		method public abstract void setTransformation(android.graphics.Matrix);
		method public abstract void setVisibility(int);
		method public abstract void setWebDomain(@Nullable String);
		field @FlaggedApi("android.service.autofill.autofill_w_metrics") public static final String EXTRA_VIRTUAL_STRUCTURE_TYPE = "android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_TYPE";
		field @FlaggedApi("android.service.autofill.autofill_w_metrics") public static final String EXTRA_VIRTUAL_STRUCTURE_VERSION_NUMBER = "android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER";
		field @FlaggedApi("android.service.autofill.autofill_w_metrics") public static final String EXTRA_VIRTUAL_STRUCTURE_TYPE = "android.view.extra.VIRTUAL_STRUCTURE_TYPE";
		field @FlaggedApi("android.service.autofill.autofill_w_metrics") public static final String EXTRA_VIRTUAL_STRUCTURE_VERSION_NUMBER = "android.view.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER";
		}

		public abstract static class ViewStructure.HtmlInfo {

core/api/lint-baseline.txt

+0 −10

Original line number	Diff line number	Diff line
		// Baseline format: 1.0
		ActionValue: android.view.ViewStructure#EXTRA_VIRTUAL_STRUCTURE_TYPE:
		Inconsistent extra value; expected `android.view.extra.VIRTUAL_STRUCTURE_TYPE`, was `android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_TYPE`
		ActionValue: android.view.ViewStructure#EXTRA_VIRTUAL_STRUCTURE_VERSION_NUMBER:
		Inconsistent extra value; expected `android.view.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER`, was `android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER`


		BroadcastBehavior: android.app.AlarmManager#ACTION_NEXT_ALARM_CLOCK_CHANGED:
		Field 'ACTION_NEXT_ALARM_CLOCK_CHANGED' is missing @BroadcastBehavior
		BroadcastBehavior: android.app.AlarmManager#ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED:
		@@ -1191,10 +1185,6 @@ UnflaggedApi: android.R.dimen#system_corner_radius_xlarge:
		New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xlarge
		UnflaggedApi: android.R.dimen#system_corner_radius_xsmall:
		New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xsmall
		UnflaggedApi: android.R.integer#status_bar_notification_info_maxnum:
		Changes from not deprecated to deprecated must be flagged with @FlaggedApi: field android.R.integer.status_bar_notification_info_maxnum
		UnflaggedApi: android.R.string#status_bar_notification_info_overflow:
		Changes from not deprecated to deprecated must be flagged with @FlaggedApi: field android.R.string.status_bar_notification_info_overflow
		UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INTERNAL_ERROR:
		New API must be flagged with @FlaggedApi: field android.accessibilityservice.AccessibilityService.OVERLAY_RESULT_INTERNAL_ERROR
		UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INVALID:

core/api/test-lint-baseline.txt

+0 −6

Original line number	Diff line number	Diff line
		// Baseline format: 1.0
		ActionValue: android.view.contentcapture.ViewNode.ViewStructureImpl#EXTRA_VIRTUAL_STRUCTURE_TYPE:
		Inconsistent extra value; expected `android.view.contentcapture.extra.VIRTUAL_STRUCTURE_TYPE`, was `android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_TYPE`
		ActionValue: android.view.contentcapture.ViewNode.ViewStructureImpl#EXTRA_VIRTUAL_STRUCTURE_VERSION_NUMBER:
		Inconsistent extra value; expected `android.view.contentcapture.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER`, was `android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER`


		BannedThrow: android.os.vibrator.persistence.VibrationXmlSerializer#serialize(android.os.VibrationEffect, java.io.Writer):
		Methods must not throw unchecked exceptions

core/java/android/service/autofill/FillEventHistory.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ public final class FillEventHistory implements Parcelable {

		/** Credential Manager suggestions are shown instead of Autofill suggestion */
		@FlaggedApi(FLAG_AUTOFILL_W_METRICS)
		public static final int UI_TYPE_CREDMAN = 4;
		public static final int UI_TYPE_CREDENTIAL_MANAGER = 4;

		/** @hide */
		@IntDef(prefix = { "UI_TYPE_" }, value = {

core/java/android/view/ViewStructure.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -87,8 +87,12 @@ public abstract class ViewStructure {
		* <p>This value is added to mainly help with debugging purpose.
		*/
		@FlaggedApi(FLAG_AUTOFILL_W_METRICS)
		@SuppressWarnings(
		"ActionValue") // Lint expects this as
		// android.view.contentcapture.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER
		// but should not have contentcapture
		public static final String EXTRA_VIRTUAL_STRUCTURE_TYPE =
		"android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_TYPE";
		"android.view.extra.VIRTUAL_STRUCTURE_TYPE";

		/**
		* Key used for specifying the version of the view that generated the virtual structure for
		@@ -98,8 +102,12 @@ public abstract class ViewStructure {
		* "104.0.5112.69", then the value should be "104.0.5112.69"
		*/
		@FlaggedApi(FLAG_AUTOFILL_W_METRICS)
		@SuppressWarnings(
		"ActionValue") // Lint expects this as
		// android.view.contentcapture.extra.VIRTUAL_STRUCTURE_TYPE
		// but should not have contentcapture
		public static final String EXTRA_VIRTUAL_STRUCTURE_VERSION_NUMBER =
		"android.view.ViewStructure.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER";
		"android.view.extra.VIRTUAL_STRUCTURE_VERSION_NUMBER";

		/**
		* Set the identifier for this view.