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

2021-04-19 08:58:17 +00:00
parent 32032cbfe3 60db8208a8
commit 5e7d4961e6
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
@@ -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