Merge "Freezer: fix delayed freezing operation" into sc-dev

2021-05-15 16:52:15 +00:00
parent 7f1f8d0bcd 775770b2c1
commit 6fb4729ecf
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -881,7 +881,10 @@ public final class CachedAppOptimizer {

    @GuardedBy({"mAm", "mProcLock"})
    void freezeAppAsyncLSP(ProcessRecord app) {
-        mFreezeHandler.removeMessages(SET_FROZEN_PROCESS_MSG, app);
+        if (mFreezeHandler.hasMessages(SET_FROZEN_PROCESS_MSG, app)) {
+            // Skip redundant DO_FREEZE message
+            return;
+        }

        mFreezeHandler.sendMessageDelayed(
                mFreezeHandler.obtainMessage(