Merge "Grant CPU_TIME capability to all "foreground" activities" into main (86cdaf57) · Commits · e / os / android_frameworks_base

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -2643,7 +2643,7 @@ public class OomAdjuster {
		}

		capability \|= getDefaultCapability(app, procState);
		capability \|= getCpuCapability(app, now);
		capability \|= getCpuCapability(app, now, foregroundActivities);

		// Procstates below BFGS should never have this capability.
		if (procState > PROCESS_STATE_BOUND_FOREGROUND_SERVICE) {
		@@ -3422,15 +3422,18 @@ public class OomAdjuster {
		return baseCapabilities \| networkCapabilities;
		}

		private static int getCpuCapability(ProcessRecord app, long nowUptime) {
		private static int getCpuCapability(ProcessRecord app, long nowUptime,
		boolean hasForegroundActivities) {
		// Note: persistent processes get all capabilities, including CPU_TIME.
		final UidRecord uidRec = app.getUidRecord();
		if (uidRec != null && uidRec.isCurAllowListed()) {
		// Process is in the power allowlist.
		return PROCESS_CAPABILITY_CPU_TIME;
		}
		if (app.mState.getCachedHasVisibleActivities()) {
		// Process has user visible activities.
		if (hasForegroundActivities) {
		// TODO: b/402987519 - This grants the Top Sleeping process CPU_TIME but eventually
		// should not.
		// Process has user perceptible activities.
		return PROCESS_CAPABILITY_CPU_TIME;
		}
		if (Flags.prototypeAggressiveFreezing()) {

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

+45 −6

Original line number	Diff line number	Diff line
		@@ -74,6 +74,10 @@ import static com.android.server.am.ProcessList.SERVICE_ADJ;
		import static com.android.server.am.ProcessList.SERVICE_B_ADJ;
		import static com.android.server.am.ProcessList.UNKNOWN_ADJ;
		import static com.android.server.am.ProcessList.VISIBLE_APP_ADJ;
		import static com.android.server.wm.WindowProcessController.ACTIVITY_STATE_FLAG_IS_PAUSING_OR_PAUSED;
		import static com.android.server.wm.WindowProcessController.ACTIVITY_STATE_FLAG_IS_STOPPING;
		import static com.android.server.wm.WindowProcessController.ACTIVITY_STATE_FLAG_IS_STOPPING_FINISHING;
		import static com.android.server.wm.WindowProcessController.ACTIVITY_STATE_FLAG_IS_VISIBLE;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		@@ -544,7 +548,7 @@ public class MockingOomAdjusterTests {
		MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
		WindowProcessController wpc = app.getWindowProcessController();
		doReturn(true).when(wpc).hasActivities();
		doReturn(WindowProcessController.ACTIVITY_STATE_FLAG_IS_VISIBLE)
		doReturn(ACTIVITY_STATE_FLAG_IS_VISIBLE)
		.when(wpc).getActivityStateFlags();
		setWakefulness(PowerManagerInternal.WAKEFULNESS_AWAKE);
		updateOomAdj(app);
		@@ -553,28 +557,58 @@ public class MockingOomAdjusterTests {
		assertFalse(app.mState.isCached());
		assertFalse(app.mState.isEmpty());
		assertEquals("vis-activity", app.mState.getAdjType());
		assertCpuTime(app);

		doReturn(WindowProcessController.ACTIVITY_STATE_FLAG_IS_VISIBLE
		doReturn(ACTIVITY_STATE_FLAG_IS_VISIBLE
		\| WindowProcessController.ACTIVITY_STATE_FLAG_RESUMED_SPLIT_SCREEN)
		.when(wpc).getActivityStateFlags();
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_TOP, VISIBLE_APP_ADJ, SCHED_GROUP_TOP_APP);
		assertEquals("resumed-split-screen-activity", app.mState.getAdjType());
		assertCpuTime(app);

		doReturn(WindowProcessController.ACTIVITY_STATE_FLAG_IS_VISIBLE
		doReturn(ACTIVITY_STATE_FLAG_IS_VISIBLE
		\| WindowProcessController.ACTIVITY_STATE_FLAG_PERCEPTIBLE_FREEFORM)
		.when(wpc).getActivityStateFlags();
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_TOP, VISIBLE_APP_ADJ, SCHED_GROUP_TOP_APP);
		assertEquals("perceptible-freeform-activity", app.mState.getAdjType());
		assertCpuTime(app);

		doReturn(WindowProcessController.ACTIVITY_STATE_FLAG_IS_VISIBLE
		doReturn(ACTIVITY_STATE_FLAG_IS_VISIBLE
		\| WindowProcessController.ACTIVITY_STATE_FLAG_VISIBLE_MULTI_WINDOW_MODE)
		.when(wpc).getActivityStateFlags();
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_TOP, VISIBLE_APP_ADJ,
		SCHED_GROUP_FOREGROUND_WINDOW);
		assertEquals("vis-multi-window-activity", app.mState.getAdjType());
		assertCpuTime(app);
		}
		@SuppressWarnings("GuardedBy")
		@Test
		public void testUpdateOomAdj_DoOne_PausingStoppingActivities() {
		ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
		MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
		WindowProcessController wpc = app.getWindowProcessController();
		doReturn(true).when(wpc).hasActivities();
		doReturn(ACTIVITY_STATE_FLAG_IS_PAUSING_OR_PAUSED).when(wpc).getActivityStateFlags();
		setWakefulness(PowerManagerInternal.WAKEFULNESS_AWAKE);
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_TOP, PERCEPTIBLE_APP_ADJ, SCHED_GROUP_DEFAULT,
		"pause-activity");
		assertCpuTime(app);

		doReturn(ACTIVITY_STATE_FLAG_IS_STOPPING).when(wpc).getActivityStateFlags();
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_LAST_ACTIVITY, PERCEPTIBLE_APP_ADJ,
		SCHED_GROUP_BACKGROUND, "stop-activity");
		assertCpuTime(app);

		doReturn(ACTIVITY_STATE_FLAG_IS_STOPPING_FINISHING).when(wpc).getActivityStateFlags();
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_CACHED_ACTIVITY, CACHED_APP_MIN_ADJ,
		SCHED_GROUP_BACKGROUND, "cch-act");
		assertNoCpuTime(app);
		}

		@SuppressWarnings("GuardedBy")
		@@ -750,7 +784,8 @@ public class MockingOomAdjusterTests {
		ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
		MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
		WindowProcessController wpc = app.getWindowProcessController();
		doReturn(true).when(wpc).hasVisibleActivities();
		doReturn(true).when(wpc).hasActivities();
		doReturn(ACTIVITY_STATE_FLAG_IS_VISIBLE).when(wpc).getActivityStateFlags();

		final ProcessRecord app2 = spy(makeDefaultProcessRecord(MOCKAPP2_PID, MOCKAPP2_UID,
		MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
		@@ -3483,12 +3518,14 @@ public class MockingOomAdjusterTests {
		// EXPECT: stale-perceptible-act adjustment
		doReturn(WindowProcessController.ACTIVITY_STATE_FLAG_IS_STOPPING_FINISHING)
		.when(wpc).getActivityStateFlags();
		assertNoCpuTime(app);

		doReturn(now - OomAdjuster.PERCEPTIBLE_TASK_TIMEOUT_MILLIS).when(
		wpc).getPerceptibleTaskStoppedTimeMillis();
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_LAST_ACTIVITY, PREVIOUS_APP_ADJ,
		SCHED_GROUP_BACKGROUND, "stale-perceptible-act");
		assertNoCpuTime(app);

		// GIVEN: perceptible adjustment is is disabled
		// EXPECT: no perceptible adjustment
		@@ -3498,15 +3535,17 @@ public class MockingOomAdjusterTests {
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_CACHED_ACTIVITY, CACHED_APP_MIN_ADJ,
		SCHED_GROUP_BACKGROUND, "cch-act");
		assertNoCpuTime(app);

		// GIVEN: perceptible app is in foreground
		// EXPECT: no perceptible adjustment
		doReturn(WindowProcessController.ACTIVITY_STATE_FLAG_IS_VISIBLE)
		doReturn(ACTIVITY_STATE_FLAG_IS_VISIBLE)
		.when(wpc).getActivityStateFlags();
		doReturn(now).when(wpc).getPerceptibleTaskStoppedTimeMillis();
		updateOomAdj(app);
		assertProcStates(app, PROCESS_STATE_TOP, VISIBLE_APP_ADJ,
		SCHED_GROUP_DEFAULT, "vis-activity");
		assertCpuTime(app);
		}

		@SuppressWarnings("GuardedBy")