From 476cacb0112e5ace18e698df74598a4157be44e3 Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Fri, 16 Apr 2021 20:44:40 +0800
Subject: [PATCH] Add missing synchronized(mLock) into Autofill onServiceDied

This is an internal fix to avoid merge conflict for AOSP change. The
developer change is aosp/1607953

Bug: 185728458
Test: manual

Change-Id: Ic16ed5e4ac507f02e56f9e9cd94d4b4cfb028d69
---
 .../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 f8b770b4ec840..6bf496777ea3a 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -1311,7 +1311,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
     @Override
     public void onServiceDied(@NonNull RemoteFillService service) {
         Slog.w(TAG, "removing session because service died");
-        forceRemoveFromServiceLocked();
+        synchronized (mLock) {
+            forceRemoveFromServiceLocked();
+        }
     }
 
     // AutoFillUiCallback