Merge "Don't freeze apps in the power exemption allow list." into tm-dev am: 2ccba9feb0 am: 9fdee99e13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19140263 Change-Id: Ia7119a0908f63aeec5169fe80a4f2fb432786ba3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user