Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35913630 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when session is finished before service replies."

parents d4194a50 8d918a71

services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java

+5 −1
Original line number Diff line number Diff line
@@ -552,6 +552,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);
@@ -573,7 +578,6 @@ final class AutoFillManagerServiceImpl { 
                        Slog.d(TAG, "finishSessionLocked(): found a change on " + id + ": "

                                + state.mAutoFillValue);

                    }



                    mUi.showSaveUi();

                    return;

                }