Merge "Cleanup migrate_full_oomadj_updates flag" into main (1b02fcbf) · Commits · e / os / android_frameworks_base

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

+2 −8

Original line number	Diff line number	Diff line
		@@ -3455,10 +3455,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		doLowMem = false;
		}
		if (doOomAdj) {
		if (Flags.migrateFullOomadjUpdates()) {
		app.forEachConnectionHost((host) -> enqueueOomAdjTargetLocked(host));
		}
		}

		EventLogTags.writeAmProcDied(app.userId, pid, app.processName, setAdj, setProcState);
		if (DEBUG_CLEANUP) Slog.v(TAG_CLEANUP,
		@@ -3466,11 +3464,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		handleAppDiedLocked(app, pid, false, true, fromBinderDied);

		if (doOomAdj) {
		if (Flags.migrateFullOomadjUpdates()) {
		updateOomAdjPendingTargetsLocked(OOM_ADJ_REASON_PROCESS_END);
		} else {
		updateOomAdjLocked(OOM_ADJ_REASON_PROCESS_END);
		}
		}
		if (doLowMem) {
		mAppProfiler.doLowMemReportIfNeededLocked(app);

+3 −7

Original line number	Diff line number	Diff line
		@@ -2389,14 +2389,10 @@ public abstract class OomAdjuster {
		final UidRecord uidRec = mActiveUids.get(uid);
		if (uidRec != null && uidRec.isCurAllowListed() != onAllowlist) {
		uidRec.setCurAllowListed(onAllowlist);
		if (Flags.migrateFullOomadjUpdates()) {
		for (int i = uidRec.getNumOfProcs() - 1; i >= 0; i--) {
		enqueueOomAdjTargetLocked(uidRec.getProcessRecordByIndex(i));
		}
		updateOomAdjPendingTargetsLocked(OOM_ADJ_REASON_ALLOWLIST);
		} else {
		updateOomAdjLSP(OOM_ADJ_REASON_ALLOWLIST);
		}
		}
		}

+0 −10

Original line number	Diff line number	Diff line
		@@ -99,16 +99,6 @@ flag {
		}
		}

		flag {
		name: "migrate_full_oomadj_updates"
		namespace: "backstage_power"
		description: "Migrate full updates to partial updates where possible"
		bug: "324915545"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "skip_unimportant_connections"
		namespace: "backstage_power"