Commit 96ae4da1 authored Sep 22, 2020 by Treehugger Robot Committed by Automerger Merge Worker Sep 22, 2020

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

Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4bece am: 476c64e4 am: 79040746 am: b3b2334a am: 736996e4

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

Change-Id: I9596a78680a67dc420587263008590edfa8e8e9d

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

+2 −2

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

		mHistoricalRegistry.clearHistory(uid, packageName);
		}
		}

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