Merge "Fix for race condition when clearing compaction list" into tm-dev

2022-03-03 06:06:10 +00:00
parent bbdc07f3f6 58a4c3ba13
commit 11a44a2ca4
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -1056,7 +1056,9 @@ public final class CachedAppOptimizer {
        if(wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE) {
            // Remove any pending compaction we may have scheduled to happen while screen was off
            Slog.e(TAG_AM, "Cancel pending or running compactions as system is awake");
-            mPendingCompactionProcesses.clear();
+            synchronized(mProcLock) {
+                mPendingCompactionProcesses.clear();
+            }
            cancelCompaction();
        }
    }