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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14553108 Change-Id: I0a74843c54bc40462b08232c6e2f187b0c9c9575
2021-05-15 17:17:18 +00:00
parent 963ddeffa5 6fb4729ecf
commit e0e6d97272
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(