commit 41125ee819b912c6ef6fba6f8aee8afcb19b96e0
author Justin Weir <justinweir@google.com> Mon Jan 23 15:10:13 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 23 15:10:13 2023 +0000
tree 1bc9965a50d4951a26ee5e125912c9036f29b787
parent c015850bf2d76f08d9e1b13cb947e63df135dfe0
parent 910fe6f8b0e7afc619886ae590ac4b9bc2dbfa60

Merge "Make an ending IME animation clean up old inputs for the same entry" into tm-qpr-dev

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
index f8c17e8..4866f73 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -303,7 +303,8 @@
                     mEntry.mRemoteEditImeVisible = editTextRootWindowInsets != null
                             && editTextRootWindowInsets.isVisible(WindowInsets.Type.ime());
                     if (!mEntry.mRemoteEditImeVisible && !mEditText.mShowImeOnInputConnection) {
-                        mController.removeRemoteInput(mEntry, mToken);
+                        // Pass null to ensure all inputs are cleared for this entry b/227115380
+                        mController.removeRemoteInput(mEntry, null);
                     }
                 }
             }