Merge "Fix deadlock between AppOpsService and HistoricalRegistry." am: 21a4becee0 am: 476c64e470 am: 7904074696 am: b3b2334a37

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271 Change-Id: Iaa35d4fca45821e529383afda80c054e7f91644e
2020-09-22 00:07:12 +00:00
parent 7380656542 b3b2334a37
commit 736996e4ab
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -1787,9 +1787,9 @@ public class AppOpsService extends IAppOpsService.Stub {
                    }
                }
            }
-
-            mHistoricalRegistry.clearHistory(uid, packageName);
        }
+
+        mHistoricalRegistry.clearHistory(uid, packageName);
    }

    public void uidRemoved(int uid) {