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

Commit 0d4e9e65 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:... 

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

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



Change-Id: I8b23218b64d3b28b82a7283fb1ed1493ce77b000
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 323676b5 42ede99e

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

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

        if (!cycleReEval) {

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

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

            state.setNoKillOnBgRestrictedAndIdle(false);

            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;

        final int appUid = app.info.uid;