Merge "Add missing synchronized(mLock) into Autofill onServiceDied" into sc-dev

2021-04-19 06:53:42 +00:00
parent a3b332e650 476cacb011
commit aa36363f72
1 changed files with 3 additions and 1 deletions
--- 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