Merge "Fix potential deadlock in shutdown in HistoricalRegistry"

2020-11-14 05:28:09 +00:00
parent cf8127cb74 42387ceaed
commit 88a27c6878
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() {