Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential deadlock in shutdown in HistoricalRegistry am: 4a2d4ddf6e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13082067

Change-Id: Iedd8d3224a84f0ba0677709091982abcba54ec9e
This commit is contained in:
Nate Myren
2020-11-18 23:17:26 +00:00
committed by Automerger Merge Worker
parent 369dfd2a3d 4a2d4ddf6e
commit 5784a50609
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/appop/HistoricalRegistry.java
View File

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