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

Commit 22d0b437 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "freezer: unfreeze upon creation of WPRI binding" into rvc-dev am: fb2441b8 

Change-Id: Iadc81c5a4959cfa6eb5773ec9e44032f1c10c21c
parents 901c083e fb2441b8

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

+6 −1
Original line number Diff line number Diff line
@@ -2588,8 +2588,13 @@ public final class OomAdjuster { 
            return;

        }



        // if an app is already frozen and shouldNotFreeze becomes true, immediately unfreeze

        if (app.frozen && app.shouldNotFreeze) {

            mCachedAppOptimizer.unfreezeAppLocked(app);

        }



        // Use current adjustment when freezing, set adjustment when unfreezing.

        if (app.curAdj >= ProcessList.CACHED_APP_MIN_ADJ && !app.frozen) {

        if (app.curAdj >= ProcessList.CACHED_APP_MIN_ADJ && !app.frozen && !app.shouldNotFreeze) {

            mCachedAppOptimizer.freezeAppAsync(app);

        } else if (app.setAdj < ProcessList.CACHED_APP_MIN_ADJ && app.frozen) {

            mCachedAppOptimizer.unfreezeAppLocked(app);