Merge "Don't freeze apps in the power exemption allow list." into tm-dev am: 2ccba9feb0 am: 9fdee99e13 am: 42ede99e6d

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

Change-Id: I8b23218b64d3b28b82a7283fb1ed1493ce77b000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hui Yu
2022-07-06 18:55:34 +00:00
committed by Automerger Merge Worker

View File

@@ -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;