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

Commit 04ab086d authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Don't freeze apps in the power exemption allow list." into tm-dev am: 2ccba9fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19140263



Change-Id: I02f9bb9542464f5b9b7d89f54ae63a2e042e87e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc3bec9d 2ccba9fe

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

+3 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,9 @@ public class OomAdjuster { 
        if (!cycleReEval) {

            // Don't reset this flag when doing cycles re-evaluation.

            state.setNoKillOnBgRestrictedAndIdle(false);

            app.mOptRecord.setShouldNotFreeze(false);

            // If this UID is currently allowlisted, it should not be frozen.

            final UidRecord uidRec = app.getUidRecord();

            app.mOptRecord.setShouldNotFreeze(uidRec != null && uidRec.isCurAllowListed());

        }



        final int appUid = app.info.uid;