Merge "Use context for correct display in the renderer service" into rvc-dev am: 85cbe43d48 (2c738c0f) · Commits · e / os / android_frameworks_base

core/java/android/service/autofill/IInlineSuggestionRenderService.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,5 +28,5 @@ import android.service.autofill.InlinePresentation;
	oneway interface IInlineSuggestionRenderService {		oneway interface IInlineSuggestionRenderService {
	void renderSuggestion(in IInlineSuggestionUiCallback callback,		void renderSuggestion(in IInlineSuggestionUiCallback callback,
	in InlinePresentation presentation, int width, int height,		in InlinePresentation presentation, int width, int height,
	in IBinder hostInputToken);		in IBinder hostInputToken, int displayId);
	}		}

core/java/android/service/autofill/InlineSuggestionRenderService.java

+24 −5

Original line number	Original line	Diff line number	Diff line
	@@ -23,14 +23,18 @@ import android.annotation.SystemApi;
	import android.annotation.TestApi;		import android.annotation.TestApi;
	import android.app.Service;		import android.app.Service;
	import android.app.slice.Slice;		import android.app.slice.Slice;
			import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.graphics.PixelFormat;		import android.graphics.PixelFormat;
			import android.hardware.display.DisplayManager;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.Looper;		import android.os.Looper;
	import android.os.RemoteException;		import android.os.RemoteException;
			import android.util.DisplayMetrics;
	import android.util.Log;		import android.util.Log;
			import android.view.Display;
	import android.view.SurfaceControl;		import android.view.SurfaceControl;
	import android.view.SurfaceControlViewHost;		import android.view.SurfaceControlViewHost;
	import android.view.View;		import android.view.View;
	@@ -61,7 +65,8 @@ public abstract class InlineSuggestionRenderService extends Service {
	private final Handler mHandler = new Handler(Looper.getMainLooper(), null, true);		private final Handler mHandler = new Handler(Looper.getMainLooper(), null, true);

	private void handleRenderSuggestion(IInlineSuggestionUiCallback callback,		private void handleRenderSuggestion(IInlineSuggestionUiCallback callback,
	InlinePresentation presentation, int width, int height, IBinder hostInputToken) {		InlinePresentation presentation, int width, int height, IBinder hostInputToken,
			int displayId) {
	if (hostInputToken == null) {		if (hostInputToken == null) {
	try {		try {
	callback.onError();		callback.onError();
	@@ -70,8 +75,17 @@ public abstract class InlineSuggestionRenderService extends Service {
	}		}
	return;		return;
	}		}
	final SurfaceControlViewHost host = new SurfaceControlViewHost(this, this.getDisplay(),
	hostInputToken);		final DisplayManager displayManager = getSystemService(DisplayManager.class);
			final Display targetDisplay = displayManager.getDisplay(displayId);
			if (targetDisplay == null) {
			sendResult(callback, /surface/ null);
			return;
			}
			final Context displayContext = createDisplayContext(targetDisplay);

			final SurfaceControlViewHost host = new SurfaceControlViewHost(displayContext,
			displayContext.getDisplay(), hostInputToken);
	final SurfaceControl surface = host.getSurfacePackage().getSurfaceControl();		final SurfaceControl surface = host.getSurfacePackage().getSurfaceControl();

	final View suggestionView = onRenderSuggestion(presentation, width, height);		final View suggestionView = onRenderSuggestion(presentation, width, height);
	@@ -90,6 +104,11 @@ public abstract class InlineSuggestionRenderService extends Service {
	new WindowManager.LayoutParams(width, height,		new WindowManager.LayoutParams(width, height,
	WindowManager.LayoutParams.TYPE_APPLICATION, 0, PixelFormat.TRANSPARENT);		WindowManager.LayoutParams.TYPE_APPLICATION, 0, PixelFormat.TRANSPARENT);
	host.addView(suggestionRoot, lp);		host.addView(suggestionRoot, lp);
			sendResult(callback, surface);
			}

			private void sendResult(@NonNull IInlineSuggestionUiCallback callback,
			@Nullable SurfaceControl surface) {
	try {		try {
	callback.onContent(surface);		callback.onContent(surface);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	@@ -105,11 +124,11 @@ public abstract class InlineSuggestionRenderService extends Service {
	@Override		@Override
	public void renderSuggestion(@NonNull IInlineSuggestionUiCallback callback,		public void renderSuggestion(@NonNull IInlineSuggestionUiCallback callback,
	@NonNull InlinePresentation presentation, int width, int height,		@NonNull InlinePresentation presentation, int width, int height,
	@Nullable IBinder hostInputToken) {		@Nullable IBinder hostInputToken, int displayId) {
	mHandler.sendMessage(obtainMessage(		mHandler.sendMessage(obtainMessage(
	InlineSuggestionRenderService::handleRenderSuggestion,		InlineSuggestionRenderService::handleRenderSuggestion,
	InlineSuggestionRenderService.this, callback, presentation,		InlineSuggestionRenderService.this, callback, presentation,
	width, height, hostInputToken));		width, height, hostInputToken, displayId));
	}		}
	}.asBinder();		}.asBinder();
	}		}

core/java/android/view/inputmethod/InlineSuggestionsRequest.java

+108 −33

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,9 @@ import android.app.ActivityThread;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.LocaleList;		import android.os.LocaleList;
			import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
			import android.view.Display;
	import android.view.inline.InlinePresentationSpec;		import android.view.inline.InlinePresentationSpec;

	import com.android.internal.util.DataClass;		import com.android.internal.util.DataClass;
	@@ -67,7 +69,11 @@ public final class InlineSuggestionsRequest implements Parcelable {
	*/		*/
	private @NonNull LocaleList mSupportedLocales;		private @NonNull LocaleList mSupportedLocales;

	// TODO(b/149609075): the generated code needs to be manually fixed due to the bug.		/**
			* The extras state propagated from the IME to pass extra data.
			*/
			private @Nullable Bundle mExtras;

	/**		/**
	* The host input token of the IME that made the request. This will be set by the system for		* The host input token of the IME that made the request. This will be set by the system for
	* safety reasons.		* safety reasons.
	@@ -77,9 +83,12 @@ public final class InlineSuggestionsRequest implements Parcelable {
	private @Nullable IBinder mHostInputToken;		private @Nullable IBinder mHostInputToken;

	/**		/**
	* The extras state propagated from the IME to pass extra data.		* The host display id of the IME that made the request. This will be set by the system for
			* safety reasons.
			*
			* @hide
	*/		*/
	private @Nullable Bundle mExtras;		private int mHostDisplayId;

	/**		/**
	* @hide		* @hide
	@@ -89,6 +98,24 @@ public final class InlineSuggestionsRequest implements Parcelable {
	mHostInputToken = hostInputToken;		mHostInputToken = hostInputToken;
	}		}

			// TODO(b/149609075): remove once IBinder parcelling is natively supported
			private void parcelHostInputToken(@NonNull Parcel parcel, int flags) {
			parcel.writeStrongBinder(mHostInputToken);
			}

			// TODO(b/149609075): remove once IBinder parcelling is natively supported
			private @Nullable IBinder unparcelHostInputToken(Parcel parcel) {
			return parcel.readStrongBinder();
			}

			/**
			* @hide
			* @see {@link #mHostDisplayId}.
			*/
			public void setHostDisplayId(int hostDisplayId) {
			mHostDisplayId = hostDisplayId;
			}

	private void onConstructed() {		private void onConstructed() {
	Preconditions.checkState(mMaxSuggestionCount >= mPresentationSpecs.size());		Preconditions.checkState(mMaxSuggestionCount >= mPresentationSpecs.size());
	}		}
	@@ -110,11 +137,18 @@ public final class InlineSuggestionsRequest implements Parcelable {
	return null;		return null;
	}		}

			@Nullable
			private static int defaultHostDisplayId() {
			return Display.INVALID_DISPLAY;
			}

	@Nullable		@Nullable
	private static Bundle defaultExtras() {		private static Bundle defaultExtras() {
	return null;		return null;
	}		}



	/** @hide */		/** @hide */
	abstract static class BaseBuilder {		abstract static class BaseBuilder {
	abstract Builder setPresentationSpecs(@NonNull List<InlinePresentationSpec> value);		abstract Builder setPresentationSpecs(@NonNull List<InlinePresentationSpec> value);
	@@ -122,6 +156,8 @@ public final class InlineSuggestionsRequest implements Parcelable {
	abstract Builder setHostPackageName(@Nullable String value);		abstract Builder setHostPackageName(@Nullable String value);

	abstract Builder setHostInputToken(IBinder hostInputToken);		abstract Builder setHostInputToken(IBinder hostInputToken);

			abstract Builder setHostDisplayId(int value);
	}		}


	@@ -145,8 +181,9 @@ public final class InlineSuggestionsRequest implements Parcelable {
	@NonNull List<InlinePresentationSpec> presentationSpecs,		@NonNull List<InlinePresentationSpec> presentationSpecs,
	@NonNull String hostPackageName,		@NonNull String hostPackageName,
	@NonNull LocaleList supportedLocales,		@NonNull LocaleList supportedLocales,
			@Nullable Bundle extras,
	@Nullable IBinder hostInputToken,		@Nullable IBinder hostInputToken,
	@Nullable Bundle extras) {		int hostDisplayId) {
	this.mMaxSuggestionCount = maxSuggestionCount;		this.mMaxSuggestionCount = maxSuggestionCount;
	this.mPresentationSpecs = presentationSpecs;		this.mPresentationSpecs = presentationSpecs;
	com.android.internal.util.AnnotationValidations.validate(		com.android.internal.util.AnnotationValidations.validate(
	@@ -157,8 +194,9 @@ public final class InlineSuggestionsRequest implements Parcelable {
	this.mSupportedLocales = supportedLocales;		this.mSupportedLocales = supportedLocales;
	com.android.internal.util.AnnotationValidations.validate(		com.android.internal.util.AnnotationValidations.validate(
	NonNull.class, null, mSupportedLocales);		NonNull.class, null, mSupportedLocales);
	this.mHostInputToken = hostInputToken;
	this.mExtras = extras;		this.mExtras = extras;
			this.mHostInputToken = hostInputToken;
			this.mHostDisplayId = hostDisplayId;

	onConstructed();		onConstructed();
	}		}
	@@ -201,6 +239,14 @@ public final class InlineSuggestionsRequest implements Parcelable {
	return mSupportedLocales;		return mSupportedLocales;
	}		}

			/**
			* The extras state propagated from the IME to pass extra data.
			*/
			@DataClass.Generated.Member
			public @Nullable Bundle getExtras() {
			return mExtras;
			}

	/**		/**
	* The host input token of the IME that made the request. This will be set by the system for		* The host input token of the IME that made the request. This will be set by the system for
	* safety reasons.		* safety reasons.
	@@ -213,11 +259,14 @@ public final class InlineSuggestionsRequest implements Parcelable {
	}		}

	/**		/**
	* The extras state propagated from the IME to pass extra data.		* The host display id of the IME that made the request. This will be set by the system for
			* safety reasons.
			*
			* @hide
	*/		*/
	@DataClass.Generated.Member		@DataClass.Generated.Member
	public @Nullable Bundle getExtras() {		public int getHostDisplayId() {
	return mExtras;		return mHostDisplayId;
	}		}

	@Override		@Override
	@@ -231,8 +280,9 @@ public final class InlineSuggestionsRequest implements Parcelable {
	"presentationSpecs = " + mPresentationSpecs + ", " +		"presentationSpecs = " + mPresentationSpecs + ", " +
	"hostPackageName = " + mHostPackageName + ", " +		"hostPackageName = " + mHostPackageName + ", " +
	"supportedLocales = " + mSupportedLocales + ", " +		"supportedLocales = " + mSupportedLocales + ", " +
			"extras = " + mExtras + ", " +
	"hostInputToken = " + mHostInputToken + ", " +		"hostInputToken = " + mHostInputToken + ", " +
	"extras = " + mExtras +		"hostDisplayId = " + mHostDisplayId +
	" }";		" }";
	}		}

	@@ -253,8 +303,9 @@ public final class InlineSuggestionsRequest implements Parcelable {
	&& java.util.Objects.equals(mPresentationSpecs, that.mPresentationSpecs)		&& java.util.Objects.equals(mPresentationSpecs, that.mPresentationSpecs)
	&& java.util.Objects.equals(mHostPackageName, that.mHostPackageName)		&& java.util.Objects.equals(mHostPackageName, that.mHostPackageName)
	&& java.util.Objects.equals(mSupportedLocales, that.mSupportedLocales)		&& java.util.Objects.equals(mSupportedLocales, that.mSupportedLocales)
			&& java.util.Objects.equals(mExtras, that.mExtras)
	&& java.util.Objects.equals(mHostInputToken, that.mHostInputToken)		&& java.util.Objects.equals(mHostInputToken, that.mHostInputToken)
	&& java.util.Objects.equals(mExtras, that.mExtras);		&& mHostDisplayId == that.mHostDisplayId;
	}		}

	@Override		@Override
	@@ -268,27 +319,29 @@ public final class InlineSuggestionsRequest implements Parcelable {
	_hash = 31 * _hash + java.util.Objects.hashCode(mPresentationSpecs);		_hash = 31 * _hash + java.util.Objects.hashCode(mPresentationSpecs);
	_hash = 31 * _hash + java.util.Objects.hashCode(mHostPackageName);		_hash = 31 * _hash + java.util.Objects.hashCode(mHostPackageName);
	_hash = 31 * _hash + java.util.Objects.hashCode(mSupportedLocales);		_hash = 31 * _hash + java.util.Objects.hashCode(mSupportedLocales);
	_hash = 31 * _hash + java.util.Objects.hashCode(mHostInputToken);
	_hash = 31 * _hash + java.util.Objects.hashCode(mExtras);		_hash = 31 * _hash + java.util.Objects.hashCode(mExtras);
			_hash = 31 * _hash + java.util.Objects.hashCode(mHostInputToken);
			_hash = 31 * _hash + mHostDisplayId;
	return _hash;		return _hash;
	}		}

	@Override		@Override
	@DataClass.Generated.Member		@DataClass.Generated.Member
	public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {		public void writeToParcel(@NonNull Parcel dest, int flags) {
	// You can override field parcelling by defining methods like:		// You can override field parcelling by defining methods like:
	// void parcelFieldName(Parcel dest, int flags) { ... }		// void parcelFieldName(Parcel dest, int flags) { ... }

	byte flg = 0;		byte flg = 0;
	if (mHostInputToken != null) flg \|= 0x10;		if (mExtras != null) flg \|= 0x10;
	if (mExtras != null) flg \|= 0x20;		if (mHostInputToken != null) flg \|= 0x20;
	dest.writeByte(flg);		dest.writeByte(flg);
	dest.writeInt(mMaxSuggestionCount);		dest.writeInt(mMaxSuggestionCount);
	dest.writeParcelableList(mPresentationSpecs, flags);		dest.writeParcelableList(mPresentationSpecs, flags);
	dest.writeString(mHostPackageName);		dest.writeString(mHostPackageName);
	dest.writeTypedObject(mSupportedLocales, flags);		dest.writeTypedObject(mSupportedLocales, flags);
	if (mHostInputToken != null) dest.writeStrongBinder(mHostInputToken);
	if (mExtras != null) dest.writeBundle(mExtras);		if (mExtras != null) dest.writeBundle(mExtras);
			parcelHostInputToken(dest, flags);
			dest.writeInt(mHostDisplayId);
	}		}

	@Override		@Override
	@@ -298,7 +351,7 @@ public final class InlineSuggestionsRequest implements Parcelable {
	/** @hide */		/** @hide */
	@SuppressWarnings({"unchecked", "RedundantCast"})		@SuppressWarnings({"unchecked", "RedundantCast"})
	@DataClass.Generated.Member		@DataClass.Generated.Member
	/* package-private */ InlineSuggestionsRequest(@NonNull android.os.Parcel in) {		/* package-private */ InlineSuggestionsRequest(@NonNull Parcel in) {
	// You can override field unparcelling by defining methods like:		// You can override field unparcelling by defining methods like:
	// static FieldType unparcelFieldName(Parcel in) { ... }		// static FieldType unparcelFieldName(Parcel in) { ... }

	@@ -308,8 +361,9 @@ public final class InlineSuggestionsRequest implements Parcelable {
	in.readParcelableList(presentationSpecs, InlinePresentationSpec.class.getClassLoader());		in.readParcelableList(presentationSpecs, InlinePresentationSpec.class.getClassLoader());
	String hostPackageName = in.readString();		String hostPackageName = in.readString();
	LocaleList supportedLocales = (LocaleList) in.readTypedObject(LocaleList.CREATOR);		LocaleList supportedLocales = (LocaleList) in.readTypedObject(LocaleList.CREATOR);
	IBinder hostInputToken = (flg & 0x10) == 0 ? null : in.readStrongBinder();		Bundle extras = (flg & 0x10) == 0 ? null : in.readBundle();
	Bundle extras = (flg & 0x20) == 0 ? null : in.readBundle();		IBinder hostInputToken = unparcelHostInputToken(in);
			int hostDisplayId = in.readInt();

	this.mMaxSuggestionCount = maxSuggestionCount;		this.mMaxSuggestionCount = maxSuggestionCount;
	this.mPresentationSpecs = presentationSpecs;		this.mPresentationSpecs = presentationSpecs;
	@@ -321,8 +375,9 @@ public final class InlineSuggestionsRequest implements Parcelable {
	this.mSupportedLocales = supportedLocales;		this.mSupportedLocales = supportedLocales;
	com.android.internal.util.AnnotationValidations.validate(		com.android.internal.util.AnnotationValidations.validate(
	NonNull.class, null, mSupportedLocales);		NonNull.class, null, mSupportedLocales);
	this.mHostInputToken = hostInputToken;
	this.mExtras = extras;		this.mExtras = extras;
			this.mHostInputToken = hostInputToken;
			this.mHostDisplayId = hostDisplayId;

	onConstructed();		onConstructed();
	}		}
	@@ -336,7 +391,7 @@ public final class InlineSuggestionsRequest implements Parcelable {
	}		}

	@Override		@Override
	public InlineSuggestionsRequest createFromParcel(@NonNull android.os.Parcel in) {		public InlineSuggestionsRequest createFromParcel(@NonNull Parcel in) {
	return new InlineSuggestionsRequest(in);		return new InlineSuggestionsRequest(in);
	}		}
	};		};
	@@ -352,8 +407,9 @@ public final class InlineSuggestionsRequest implements Parcelable {
	private @NonNull List<InlinePresentationSpec> mPresentationSpecs;		private @NonNull List<InlinePresentationSpec> mPresentationSpecs;
	private @NonNull String mHostPackageName;		private @NonNull String mHostPackageName;
	private @NonNull LocaleList mSupportedLocales;		private @NonNull LocaleList mSupportedLocales;
	private @Nullable IBinder mHostInputToken;
	private @Nullable Bundle mExtras;		private @Nullable Bundle mExtras;
			private @Nullable IBinder mHostInputToken;
			private int mHostDisplayId;

	private long mBuilderFieldsSet = 0L;		private long mBuilderFieldsSet = 0L;

	@@ -435,6 +491,17 @@ public final class InlineSuggestionsRequest implements Parcelable {
	return this;		return this;
	}		}

			/**
			* The extras state propagated from the IME to pass extra data.
			*/
			@DataClass.Generated.Member
			public @NonNull Builder setExtras(@Nullable Bundle value) {
			checkNotUsed();
			mBuilderFieldsSet \|= 0x10;
			mExtras = value;
			return this;
			}

	/**		/**
	* The host input token of the IME that made the request. This will be set by the system for		* The host input token of the IME that made the request. This will be set by the system for
	* safety reasons.		* safety reasons.
	@@ -445,26 +512,30 @@ public final class InlineSuggestionsRequest implements Parcelable {
	@Override		@Override
	@NonNull Builder setHostInputToken(@Nullable IBinder value) {		@NonNull Builder setHostInputToken(@Nullable IBinder value) {
	checkNotUsed();		checkNotUsed();
	mBuilderFieldsSet \|= 0x10;		mBuilderFieldsSet \|= 0x20;
	mHostInputToken = value;		mHostInputToken = value;
	return this;		return this;
	}		}

	/**		/**
	* The extras state propagated from the IME to pass extra data.		* The host display id of the IME that made the request. This will be set by the system for
			* safety reasons.
			*
			* @hide
	*/		*/
	@DataClass.Generated.Member		@DataClass.Generated.Member
	public @NonNull Builder setExtras(@Nullable Bundle value) {		@Override
			@NonNull Builder setHostDisplayId(int value) {
	checkNotUsed();		checkNotUsed();
	mBuilderFieldsSet \|= 0x20;		mBuilderFieldsSet \|= 0x40;
	mExtras = value;		mHostDisplayId = value;
	return this;		return this;
	}		}

	/** Builds the instance. This builder should not be touched after calling this! */		/** Builds the instance. This builder should not be touched after calling this! */
	public @NonNull InlineSuggestionsRequest build() {		public @NonNull InlineSuggestionsRequest build() {
	checkNotUsed();		checkNotUsed();
	mBuilderFieldsSet \|= 0x40; // Mark builder used		mBuilderFieldsSet \|= 0x80; // Mark builder used

	if ((mBuilderFieldsSet & 0x1) == 0) {		if ((mBuilderFieldsSet & 0x1) == 0) {
	mMaxSuggestionCount = defaultMaxSuggestionCount();		mMaxSuggestionCount = defaultMaxSuggestionCount();
	@@ -476,23 +547,27 @@ public final class InlineSuggestionsRequest implements Parcelable {
	mSupportedLocales = defaultSupportedLocales();		mSupportedLocales = defaultSupportedLocales();
	}		}
	if ((mBuilderFieldsSet & 0x10) == 0) {		if ((mBuilderFieldsSet & 0x10) == 0) {
	mHostInputToken = defaultHostInputToken();		mExtras = defaultExtras();
	}		}
	if ((mBuilderFieldsSet & 0x20) == 0) {		if ((mBuilderFieldsSet & 0x20) == 0) {
	mExtras = defaultExtras();		mHostInputToken = defaultHostInputToken();
			}
			if ((mBuilderFieldsSet & 0x40) == 0) {
			mHostDisplayId = defaultHostDisplayId();
	}		}
	InlineSuggestionsRequest o = new InlineSuggestionsRequest(		InlineSuggestionsRequest o = new InlineSuggestionsRequest(
	mMaxSuggestionCount,		mMaxSuggestionCount,
	mPresentationSpecs,		mPresentationSpecs,
	mHostPackageName,		mHostPackageName,
	mSupportedLocales,		mSupportedLocales,
			mExtras,
	mHostInputToken,		mHostInputToken,
	mExtras);		mHostDisplayId);
	return o;		return o;
	}		}

	private void checkNotUsed() {		private void checkNotUsed() {
	if ((mBuilderFieldsSet & 0x40) != 0) {		if ((mBuilderFieldsSet & 0x80) != 0) {
	throw new IllegalStateException(		throw new IllegalStateException(
	"This Builder should not be reused. Use a new Builder instance instead");		"This Builder should not be reused. Use a new Builder instance instead");
	}		}
	@@ -500,10 +575,10 @@ public final class InlineSuggestionsRequest implements Parcelable {
	}		}

	@DataClass.Generated(		@DataClass.Generated(
	time = 1581747892762L,		time = 1582339908980L,
	codegenVersion = "1.0.14",		codegenVersion = "1.0.14",
	sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionsRequest.java",		sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionsRequest.java",
	inputSignatures = "public static final int SUGGESTION_COUNT_UNLIMITED\nprivate final int mMaxSuggestionCount\nprivate final @android.annotation.NonNull java.util.List<android.view.inline.InlinePresentationSpec> mPresentationSpecs\nprivate @android.annotation.NonNull java.lang.String mHostPackageName\nprivate @android.annotation.NonNull android.os.LocaleList mSupportedLocales\nprivate @android.annotation.Nullable android.os.IBinder mHostInputToken\nprivate @android.annotation.Nullable android.os.Bundle mExtras\npublic void setHostInputToken(android.os.IBinder)\nprivate void onConstructed()\nprivate static int defaultMaxSuggestionCount()\nprivate static java.lang.String defaultHostPackageName()\nprivate static android.os.LocaleList defaultSupportedLocales()\nprivate static @android.annotation.Nullable android.os.IBinder defaultHostInputToken()\nprivate static @android.annotation.Nullable android.os.Bundle defaultExtras()\nclass InlineSuggestionsRequest extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setPresentationSpecs(java.util.List<android.view.inline.InlinePresentationSpec>)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostPackageName(java.lang.String)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostInputToken(android.os.IBinder)\nclass BaseBuilder extends java.lang.Object implements []")		inputSignatures = "public static final int SUGGESTION_COUNT_UNLIMITED\nprivate final int mMaxSuggestionCount\nprivate final @android.annotation.NonNull java.util.List<android.view.inline.InlinePresentationSpec> mPresentationSpecs\nprivate @android.annotation.NonNull java.lang.String mHostPackageName\nprivate @android.annotation.NonNull android.os.LocaleList mSupportedLocales\nprivate @android.annotation.Nullable android.os.Bundle mExtras\nprivate @android.annotation.Nullable android.os.IBinder mHostInputToken\nprivate int mHostDisplayId\npublic void setHostInputToken(android.os.IBinder)\nprivate void parcelHostInputToken(android.os.Parcel,int)\nprivate @android.annotation.Nullable android.os.IBinder unparcelHostInputToken(android.os.Parcel)\npublic void setHostDisplayId(int)\nprivate void onConstructed()\nprivate static int defaultMaxSuggestionCount()\nprivate static java.lang.String defaultHostPackageName()\nprivate static android.os.LocaleList defaultSupportedLocales()\nprivate static @android.annotation.Nullable android.os.IBinder defaultHostInputToken()\nprivate static @android.annotation.Nullable int defaultHostDisplayId()\nprivate static @android.annotation.Nullable android.os.Bundle defaultExtras()\nclass InlineSuggestionsRequest extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setPresentationSpecs(java.util.List<android.view.inline.InlinePresentationSpec>)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostPackageName(java.lang.String)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostInputToken(android.os.IBinder)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostDisplayId(int)\nclass BaseBuilder extends java.lang.Object implements []")
	@Deprecated		@Deprecated
	private void __metadata() {}		private void __metadata() {}

services/autofill/java/com/android/server/autofill/RemoteInlineSuggestionRenderService.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -86,9 +86,9 @@ public final class RemoteInlineSuggestionRenderService extends
	*/		*/
	public void renderSuggestion(@NonNull IInlineSuggestionUiCallback callback,		public void renderSuggestion(@NonNull IInlineSuggestionUiCallback callback,
	@NonNull InlinePresentation presentation, int width, int height,		@NonNull InlinePresentation presentation, int width, int height,
	@Nullable IBinder hostInputToken) {		@Nullable IBinder hostInputToken, int displayId) {
	scheduleAsyncRequest(		scheduleAsyncRequest((s) -> s.renderSuggestion(callback, presentation, width, height,
	(s) -> s.renderSuggestion(callback, presentation, width, height, hostInputToken));		hostInputToken, displayId));
	}		}

	@Nullable		@Nullable

services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java

+15 −11

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,7 @@ public final class InlineSuggestionFactory {
	if (inlineAuthentication != null) {		if (inlineAuthentication != null) {
	InlineSuggestion inlineAuthSuggestion = createInlineAuthSuggestion(inlineAuthentication,		InlineSuggestion inlineAuthSuggestion = createInlineAuthSuggestion(inlineAuthentication,
	remoteRenderService, onClickFactory, onErrorCallback,		remoteRenderService, onClickFactory, onErrorCallback,
	request.getHostInputToken());		request.getHostInputToken(), request.getHostDisplayId());
	inlineSuggestions.add(inlineAuthSuggestion);		inlineSuggestions.add(inlineAuthSuggestion);

	return new InlineSuggestionsResponse(inlineSuggestions);		return new InlineSuggestionsResponse(inlineSuggestions);
	@@ -164,7 +164,7 @@ public final class InlineSuggestionFactory {
	InlineSuggestion inlineSuggestion = createInlineSuggestion(isAugmented, dataset,		InlineSuggestion inlineSuggestion = createInlineSuggestion(isAugmented, dataset,
	fieldIndex, mergedInlinePresentation(request, datasetIndex, inlinePresentation),		fieldIndex, mergedInlinePresentation(request, datasetIndex, inlinePresentation),
	onClickFactory, remoteRenderService, onErrorCallback,		onClickFactory, remoteRenderService, onErrorCallback,
	request.getHostInputToken());		request.getHostInputToken(), request.getHostDisplayId());

	inlineSuggestions.add(inlineSuggestion);		inlineSuggestions.add(inlineSuggestion);
	}		}
	@@ -172,7 +172,8 @@ public final class InlineSuggestionFactory {
	for (InlinePresentation inlinePresentation : inlineActions) {		for (InlinePresentation inlinePresentation : inlineActions) {
	final InlineSuggestion inlineAction = createInlineAction(isAugmented, context,		final InlineSuggestion inlineAction = createInlineAction(isAugmented, context,
	mergedInlinePresentation(request, 0, inlinePresentation),		mergedInlinePresentation(request, 0, inlinePresentation),
	remoteRenderService, onErrorCallback, request.getHostInputToken());		remoteRenderService, onErrorCallback, request.getHostInputToken(),
			request.getHostDisplayId());
	inlineSuggestions.add(inlineAction);		inlineSuggestions.add(inlineAction);
	}		}
	}		}
	@@ -215,7 +216,8 @@ public final class InlineSuggestionFactory {
	@NonNull Context context,		@NonNull Context context,
	@NonNull InlinePresentation inlinePresentation,		@NonNull InlinePresentation inlinePresentation,
	@Nullable RemoteInlineSuggestionRenderService remoteRenderService,		@Nullable RemoteInlineSuggestionRenderService remoteRenderService,
	@NonNull Runnable onErrorCallback, @Nullable IBinder hostInputToken) {		@NonNull Runnable onErrorCallback, @Nullable IBinder hostInputToken,
			int displayId) {
	// TODO(b/146453195): fill in the autofill hint properly.		// TODO(b/146453195): fill in the autofill hint properly.
	final InlineSuggestionInfo inlineSuggestionInfo = new InlineSuggestionInfo(		final InlineSuggestionInfo inlineSuggestionInfo = new InlineSuggestionInfo(
	inlinePresentation.getInlinePresentationSpec(),		inlinePresentation.getInlinePresentationSpec(),
	@@ -227,7 +229,7 @@ public final class InlineSuggestionFactory {
	};		};
	return new InlineSuggestion(inlineSuggestionInfo,		return new InlineSuggestion(inlineSuggestionInfo,
	createInlineContentProvider(inlinePresentation, onClickAction, onErrorCallback,		createInlineContentProvider(inlinePresentation, onClickAction, onErrorCallback,
	remoteRenderService, hostInputToken));		remoteRenderService, hostInputToken, displayId));
	}		}