Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c524b8a authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Clear the pending app freezer task if it's killed." into sc-dev

parents 65093343 6e295986

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

+3 −0
Original line number Diff line number Diff line
@@ -11501,6 +11501,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // and it's not isolated, as we'd need the signal to bookkeeping the dying process list.

            restart = app.onCleanupApplicationRecordLSP(mProcessStats, allowRestart,

                    fromBinderDied || app.isolated /* unlinkDeath */);













            // Cancel pending frozen task if there is any.













            mOomAdjuster.mCachedAppOptimizer.unscheduleFreezeAppLSP(app);















        }















        mAppProfiler.onCleanupApplicationRecordLocked(app);















        skipCurrentReceiverLocked(app);

































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



+10
−0




























Original line number
Diff line number
Diff line








@@ -974,6 +974,16 @@ public final class CachedAppOptimizer {













        }















    }





























    /**













     * To be called when the given app is killed.













     */













    @GuardedBy({"mAm", "mProcLock"})













    void unscheduleFreezeAppLSP(ProcessRecord app) {













        if (mUseFreezer) {













            mFreezeHandler.removeMessages(SET_FROZEN_PROCESS_MSG, app);













        }













    }





























    @VisibleForTesting















    static final class LastCompactionStats {















        private final long[] mRssAfterCompaction;