Fix NPE when session is finished before service replies.

Fixes: 35114623
Test: manual verificaiton
Test: CtsAutoFillServiceTestCases passes
Change-Id: Id38babd038c79dc3e7070483437adec1b415a072

1 files changed, 5 insertions, 1 deletions

diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
index 88f1bda39664..0a8c5e7c44ca 100644
--- a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
@@ -541,6 +541,11 @@ final class AutoFillManagerServiceImpl {
                 Slog.wtf(TAG, "showSaveLocked(): no mStructure");
                 return;
             }
+            if (mCurrentResponse == null) {
+                // Happens when the activity / session was finished before the service replied.
+                Slog.d(TAG, "showSaveLocked(): no mCurrentResponse yet");
+                return;
+            }
             final ArraySet<AutoFillId> savableIds = mCurrentResponse.getSavableIds();
             if (VERBOSE) Slog.v(TAG, "showSaveLocked(): savableIds=" + savableIds);
 
@@ -562,7 +567,6 @@ final class AutoFillManagerServiceImpl {
                         Slog.d(TAG, "finishSessionLocked(): found a change on " + id + ": "
                                 + state.mAutoFillValue);
                     }
-
                     mUi.showSaveUi();
                     return;
                 }