Merge "Fix inline suggestion ref counting to not over-count" into rvc-dev am:... (063bffe4) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InlineSuggestion.java

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -326,12 +326,14 @@ public final class InlineSuggestion implements Parcelable {

	@MainThread		@MainThread
	private void handleOnSurfacePackageReleased() {		private void handleOnSurfacePackageReleased() {
	mSurfacePackage = null;		if (mSurfacePackage != null) {
	try {		try {
	mInlineContentProvider.onSurfacePackageReleased();		mInlineContentProvider.onSurfacePackageReleased();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.w(TAG, "Error calling onSurfacePackageReleased(): " + e);		Slog.w(TAG, "Error calling onSurfacePackageReleased(): " + e);
	}		}
			mSurfacePackage = null;
			}
	}		}

	@MainThread		@MainThread
	@@ -573,7 +575,7 @@ public final class InlineSuggestion implements Parcelable {
	};		};

	@DataClass.Generated(		@DataClass.Generated(
	time = 1588308946517L,		time = 1589396017700L,
	codegenVersion = "1.0.15",		codegenVersion = "1.0.15",
	sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestion.java",		sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestion.java",
	inputSignatures = "private static final java.lang.String TAG\nprivate final @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo mInfo\nprivate final @android.annotation.Nullable com.android.internal.view.inline.IInlineContentProvider mContentProvider\nprivate @com.android.internal.util.DataClass.ParcelWith(android.view.inputmethod.InlineSuggestion.InlineContentCallbackImplParceling.class) @android.annotation.Nullable android.view.inputmethod.InlineSuggestion.InlineContentCallbackImpl mInlineContentCallback\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestion newInlineSuggestion(android.view.inputmethod.InlineSuggestionInfo)\npublic void inflate(android.content.Context,android.util.Size,java.util.concurrent.Executor,java.util.function.Consumer<android.widget.inline.InlineContentView>)\nprivate static boolean isValid(int,int,int)\nprivate synchronized android.view.inputmethod.InlineSuggestion.InlineContentCallbackImpl getInlineContentCallback(android.content.Context,java.util.concurrent.Executor,java.util.function.Consumer<android.widget.inline.InlineContentView>)\nclass InlineSuggestion extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")		inputSignatures = "private static final java.lang.String TAG\nprivate final @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo mInfo\nprivate final @android.annotation.Nullable com.android.internal.view.inline.IInlineContentProvider mContentProvider\nprivate @com.android.internal.util.DataClass.ParcelWith(android.view.inputmethod.InlineSuggestion.InlineContentCallbackImplParceling.class) @android.annotation.Nullable android.view.inputmethod.InlineSuggestion.InlineContentCallbackImpl mInlineContentCallback\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestion newInlineSuggestion(android.view.inputmethod.InlineSuggestionInfo)\npublic void inflate(android.content.Context,android.util.Size,java.util.concurrent.Executor,java.util.function.Consumer<android.widget.inline.InlineContentView>)\nprivate static boolean isValid(int,int,int)\nprivate synchronized android.view.inputmethod.InlineSuggestion.InlineContentCallbackImpl getInlineContentCallback(android.content.Context,java.util.concurrent.Executor,java.util.function.Consumer<android.widget.inline.InlineContentView>)\nclass InlineSuggestion extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")