Fix potential deadlock in shutdown in HistoricalRegistry am: 4a2d4ddf6e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13082067 Change-Id: Iedd8d3224a84f0ba0677709091982abcba54ec9e
2020-11-18 23:17:26 +00:00
parent 369dfd2a3d 4a2d4ddf6e
commit 5784a50609
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/appop/HistoricalRegistry.java
+++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java
@@ -669,10 +669,12 @@ final class HistoricalRegistry {

    void shutdown() {
        synchronized (mInMemoryLock) {
-            if (mMode != AppOpsManager.HISTORICAL_MODE_DISABLED) {
-                persistPendingHistory();
+            if (mMode == AppOpsManager.HISTORICAL_MODE_DISABLED) {
+                return;
            }
        }
+        // Do not call persistPendingHistory inside the memory lock, due to possible deadlock
+        persistPendingHistory();
    }

    void persistPendingHistory() {