commit 66121902a51b67ef29bd24cc42b5b6201fa52ad6
author TYM Tsai <tymtsai@google.com> Tue Dec 03 14:52:15 2019 +0800
committer TYM Tsai <tymtsai@google.com> Mon Dec 09 06:18:57 2019 +0000
tree 0113e64ae3646a8afc09d25779016adadbda4dda
parent 948ed682ffb3a2e207fe67afc3529991074f7125

Fix crash after destroyed

Remove the touch listener while destroyed to avoid causing the
IllegalStateException.

Fixes: 144703050
Test: atest CtsAutoFillServiceTestCases
Change-Id: I04b30fa3cef5bea00a4dbd9957cae8246f09a802
(cherry picked from commit 93e16223652c635cb79739e2fea2ed8d4283556e)

core/java/android/service/autofill/augmented/FillWindow.java

diff --git a/core/java/android/service/autofill/augmented/FillWindow.java b/core/java/android/service/autofill/augmented/FillWindow.java
index 6a29d48..5d00370 100644
--- a/core/java/android/service/autofill/augmented/FillWindow.java
+++ b/core/java/android/service/autofill/augmented/FillWindow.java
@@ -242,6 +242,7 @@
         synchronized (mLock) {
             if (mDestroyed) return;
             if (mUpdateCalled) {
+                mFillView.setOnClickListener(null);
                 hide();
                 mProxy.report(AutofillProxy.REPORT_EVENT_UI_DESTROYED);
             }