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

Commit 6f0662a2 authored Apr 14, 2025 by Michael Wachenschwanz Committed by Android (Google) Code Review Apr 14, 2025

Merge "Cleanup add_modify_raw_oom_adj_service_level flag" into main

parents 12cfefe5 b2728584

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ final class ProcessServiceRecord {
		adj = ProcessList.PERCEPTIBLE_APP_ADJ;
		} else if (adj < ProcessList.PERCEPTIBLE_LOW_APP_ADJ) {
		adj = ProcessList.PERCEPTIBLE_LOW_APP_ADJ;
		} else if (Flags.addModifyRawOomAdjServiceLevel() && adj < ProcessList.SERVICE_ADJ) {
		} else if (adj < ProcessList.SERVICE_ADJ) {
		adj = ProcessList.SERVICE_ADJ;
		} else if (adj < ProcessList.CACHED_APP_MIN_ADJ) {
		adj = ProcessList.CACHED_APP_MIN_ADJ;

services/core/java/com/android/server/am/flags.aconfig

+0 −10

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

		flag {
		name: "add_modify_raw_oom_adj_service_level"
		namespace: "backstage_power"
		description: "Add a SERVICE_ADJ level to the modifyRawOomAdj method"
		bug: "374810368"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "app_start_info_isolated_process"
		namespace: "system_performance"

services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -1670,13 +1670,7 @@ public class MockingOomAdjusterTests {
		setWakefulness(PowerManagerInternal.WAKEFULNESS_AWAKE);
		updateOomAdj(client, app, service);

		final int expectedAdj;
		if (Flags.addModifyRawOomAdjServiceLevel()) {
		expectedAdj = SERVICE_ADJ;
		} else {
		expectedAdj = CACHED_APP_MIN_ADJ;
		}
		assertEquals(expectedAdj, app.mState.getSetAdj());
		assertEquals(SERVICE_ADJ, app.mState.getSetAdj());
		}

		@SuppressWarnings("GuardedBy")