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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271 Change-Id: I9d89f556e5fcca621f9e5e0314c9996faaf8ea11
2020-09-21 23:07:23 +00:00
parent ce0de3705c 476c64e470
commit 7904074696
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
@@ -1786,9 +1786,9 @@ public class AppOpsService extends IAppOpsService.Stub {
                    }
                }
            }
-
-            mHistoricalRegistry.clearHistory(uid, packageName);
        }
+
+        mHistoricalRegistry.clearHistory(uid, packageName);
    }

    public void uidRemoved(int uid) {