commit 5e7d4961e6b756ebda7e735280b64412dc5b7660
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 19 08:58:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 19 08:58:17 2021 +0000
tree dda32b4ec75f20bfc0c8758e54f5b0f327863955
parent 32032cbfe3cf57dc3c4c0423ff7faabf103485cc
parent 60db8208a835ce423ab551ced4063db2994f280e

Merge "Add missing synchronized(mLock) into Autofill onServiceDied"

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

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 1970b57..f5497f9 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -1204,7 +1204,9 @@
     @Override
     public void onServiceDied(@NonNull RemoteFillService service) {
         Slog.w(TAG, "removing session because service died");
-        forceRemoveSelfLocked();
+        synchronized (mLock) {
+            forceRemoveSelfLocked();
+        }
     }
 
     // AutoFillUiCallback