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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433271 Change-Id: I8c62def14eba9348649918e25a23828b93bc37be
2020-09-21 23:19:24 +00:00
parent 3735f6abe4 7904074696
commit b3b2334a37
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) {