From 60db8208a835ce423ab551ced4063db2994f280e Mon Sep 17 00:00:00 2001
From: v-qianliguo <v-qianliguo@xiaomi.com>
Date: Thu, 25 Feb 2021 17:41:17 +0800
Subject: [PATCH] Add missing synchronized(mLock) into Autofill onServiceDied

Test: N/A
Signed-off-by: v-qianliguo <v-qianliguo@xiaomi.com>
Merged-In: Ic16ed5e4ac507f02e56f9e9cd94d4b4cfb028d69
Change-Id: I5c9640ab0695386effdbaaad7b72e143668af876
---
 .../autofill/java/com/android/server/autofill/Session.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 1970b5774bbbc..f5497f9213152 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 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
     @Override
     public void onServiceDied(@NonNull RemoteFillService service) {
         Slog.w(TAG, "removing session because service died");
-        forceRemoveSelfLocked();
+        synchronized (mLock) {
+            forceRemoveSelfLocked();
+        }
     }
 
     // AutoFillUiCallback