Commit 476c64e4 authored Sep 21, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 21, 2020

Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4bece

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271

Change-Id: I6b7df19f748602ec4448619d204ba9e515d14a44

services/core/java/com/android/server/appop/AppOpsService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1786,10 +1786,10 @@ public class AppOpsService extends IAppOpsService.Stub {
		}
		}
		}
		}

		mHistoricalRegistry.clearHistory(uid, packageName);
		}
		}

		public void uidRemoved(int uid) {
		synchronized (this) {