Merge "Address nits from ag/25977295" into main (1710ca94) · Commits · e / os / android_frameworks_base

core/java/android/app/assist/AssistStructure.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -1289,11 +1289,7 @@ public class AssistStructure implements Parcelable {
		}

		/**
		*
		* @return
		*
		* @hide
		*
		*/
		@FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION)
		@Nullable
		@@ -2571,7 +2567,7 @@ public class AssistStructure implements Parcelable {
		}
		AutofillId autofillId = node.getAutofillId();
		if (autofillId == null) {
		Log.i(TAG, prefix + " NO autofill ID");
		Log.i(TAG, prefix + " No autofill ID");
		} else {
		Log.i(TAG, prefix + " Autofill info: id= " + autofillId
		+ ", type=" + node.getAutofillType()
		@@ -2586,7 +2582,7 @@ public class AssistStructure implements Parcelable {
		}
		GetCredentialRequest getCredentialRequest = node.getCredentialManagerRequest();
		if (getCredentialRequest == null) {
		Log.i(TAG, prefix + " NO Credential Manager Request");
		Log.i(TAG, prefix + " No Credential Manager Request");
		} else {
		Log.i(TAG, prefix + " GetCredentialRequest: no. of options= "
		+ getCredentialRequest.getCredentialOptions().size()

+0 −3

Original line number	Diff line number	Diff line
		@@ -63,9 +63,6 @@ public final class GetCredentialResponse implements Parcelable {
		}

		/**
		*
		* @return
		*
		* @hide
		*/
		public AutofillId getAutofillId() {

+0 −1

Original line number	Diff line number	Diff line
		@@ -1047,7 +1047,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		@Nullable
		private ViewCredentialHandler mViewCredentialHandler;


		/** Used to avoid computing the full strings each time when layout tracing is enabled. */
		@Nullable
		private ViewTraversalTracingStrings mTracingStrings;