From ec3f84a899015c3a83d6431b116f8a1cb7569099 Mon Sep 17 00:00:00 2001
From: Feng Cao <fengcao@google.com>
Date: Mon, 23 Dec 2019 12:46:58 -0800
Subject: Make InputMethodService to never reuse the inline suggestion response
 callback.

Test: manual
Bug: 146903532

Change-Id: I7bc007fb3009897cba57e63edbc67cef541f0e05
---
 .../android/inputmethodservice/InputMethodService.java    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'core/java/android/inputmethodservice/InputMethodService.java')

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 7da7dc120dcb..a45f70316953 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -450,9 +450,6 @@ public class InputMethodService extends AbstractInputMethodService {
     @Nullable
     private InlineSuggestionsRequestInfo mInlineSuggestionsRequestInfo = null;
 
-    @Nullable
-    private InlineSuggestionsResponseCallbackImpl mInlineSuggestionsResponseCallback = null;
-
     private final Handler mHandler = new Handler(Looper.getMainLooper(), null, true);
 
     final ViewTreeObserver.OnComputeInternalInsetsListener mInsetsComputer = info -> {
@@ -752,14 +749,12 @@ public class InputMethodService extends AbstractInputMethodService {
                 Log.w(TAG, "onCreateInlineSuggestionsRequest() returned null request");
                 requestCallback.onInlineSuggestionsUnsupported();
             } else {
-                if (mInlineSuggestionsResponseCallback == null) {
-                    mInlineSuggestionsResponseCallback =
-                            new InlineSuggestionsResponseCallbackImpl(this,
-                                    mInlineSuggestionsRequestInfo.mComponentName,
-                                    mInlineSuggestionsRequestInfo.mFocusedId);
-                }
+                final IInlineSuggestionsResponseCallback inlineSuggestionsResponseCallback =
+                        new InlineSuggestionsResponseCallbackImpl(this,
+                                mInlineSuggestionsRequestInfo.mComponentName,
+                                mInlineSuggestionsRequestInfo.mFocusedId);
                 requestCallback.onInlineSuggestionsRequest(request,
-                        mInlineSuggestionsResponseCallback);
+                        inlineSuggestionsResponseCallback);
             }
         } catch (RemoteException e) {
             Log.w(TAG, "makeInlinedSuggestionsRequest() remote exception:" + e);
-- 
cgit v1.2.3