commit 6fb4729ecf0bac375f8ef5d2260c4efeb0e802a7
author Li Li <dualli@google.com> Sat May 15 16:52:15 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 15 16:52:15 2021 +0000
tree 20313ecedf07137e8cad76c5ac732b29dc489296
parent 7f1f8d0bcd1456fd47a42d5f0afc5cea39495091
parent 775770b2c15f5e084b4b0a9f955a3415b6324294

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

services/core/java/com/android/server/am/CachedAppOptimizer.java

diff --git a/services/core/java/com/android/server/am/CachedAppOptimizer.java b/services/core/java/com/android/server/am/CachedAppOptimizer.java
index 709139e..4629d0b 100644
--- a/services/core/java/com/android/server/am/CachedAppOptimizer.java
+++ b/services/core/java/com/android/server/am/CachedAppOptimizer.java
@@ -881,7 +881,10 @@
 
     @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(