Merge "Only promote remote animator to top sched group during animation" into... (8fd20348) · Commits · e / os / android_frameworks_base

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

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1671,6 +1671,12 @@ public class ActivityManagerService extends IActivityManager.Stub
	*/		*/
	@Nullable ContentCaptureManagerInternal mContentCaptureService;		@Nullable ContentCaptureManagerInternal mContentCaptureService;

			/**
			* Set of {@link ProcessRecord} that have either {@link ProcessRecord#hasTopUi()} or
			* {@link ProcessRecord#runningRemoteAnimation} set to {@code true}.
			*/
			final ArraySet<ProcessRecord> mTopUiOrRunningRemoteAnimApps = new ArraySet<>();

	final class UiHandler extends Handler {		final class UiHandler extends Handler {
	public UiHandler() {		public UiHandler() {
	super(com.android.server.UiThread.get().getLooper(), null, true);		super(com.android.server.UiThread.get().getLooper(), null, true);
	@@ -14702,6 +14708,7 @@ public class ActivityManagerService extends IActivityManager.Stub

	mProcessesToGc.remove(app);		mProcessesToGc.remove(app);
	mPendingPssProcesses.remove(app);		mPendingPssProcesses.remove(app);
			mTopUiOrRunningRemoteAnimApps.remove(app);
	ProcessList.abortNextPssTime(app.procStateMemTracker);		ProcessList.abortNextPssTime(app.procStateMemTracker);

	// Dismiss any open dialogs.		// Dismiss any open dialogs.
	@@ -18490,6 +18497,22 @@ public class ActivityManagerService extends IActivityManager.Stub
	return proc;		return proc;
	}		}

			/**
			* @return {@code true} if {@link #mTopUiOrRunningRemoteAnimApps} set contains {@code app} or when there are no apps
			* in this list, an false otherwise.
			*/
			boolean containsTopUiOrRunningRemoteAnimOrEmptyLocked(ProcessRecord app) {
			return mTopUiOrRunningRemoteAnimApps.isEmpty() \|\| mTopUiOrRunningRemoteAnimApps.contains(app);
			}

			void addTopUiOrRunningRemoteAnim(ProcessRecord app) {
			mTopUiOrRunningRemoteAnimApps.add(app);
			}

			void removeTopUiOrRunningRemoteAnim(ProcessRecord app) {
			mTopUiOrRunningRemoteAnimApps.remove(app);
			}

	@Override		@Override
	public boolean dumpHeap(String process, int userId, boolean managed, boolean mallocInfo,		public boolean dumpHeap(String process, int userId, boolean managed, boolean mallocInfo,
	boolean runGc, String path, ParcelFileDescriptor fd, RemoteCallback finishCallback) {		boolean runGc, String path, ParcelFileDescriptor fd, RemoteCallback finishCallback) {

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

+24 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1151,8 +1151,17 @@ public final class OomAdjuster {
	// is currently showing UI.		// is currently showing UI.
	app.systemNoUi = true;		app.systemNoUi = true;
	if (app == topApp) {		if (app == topApp) {
	app.systemNoUi = false;		// If specific system app has set ProcessRecord.mHasTopUi or is running a remote
			// animation (ProcessRecord.runningRemoteAnimation), this will prevent topApp
			// to use SCHED_GROUP_TOP_APP to ensure process with mHasTopUi will have exclusive
			// access to configured cores.
			if (mService.containsTopUiOrRunningRemoteAnimOrEmptyLocked(app)) {
	app.setCurrentSchedulingGroup(ProcessList.SCHED_GROUP_TOP_APP);		app.setCurrentSchedulingGroup(ProcessList.SCHED_GROUP_TOP_APP);
			} else {
			app.setCurrentSchedulingGroup(ProcessList.SCHED_GROUP_DEFAULT);
			}
			app.systemNoUi = false;

	app.adjType = "pers-top-activity";		app.adjType = "pers-top-activity";
	} else if (app.hasTopUi()) {		} else if (app.hasTopUi()) {
	// sched group/proc state adjustment is below		// sched group/proc state adjustment is below
	@@ -1193,10 +1202,20 @@ public final class OomAdjuster {

	boolean foregroundActivities = false;		boolean foregroundActivities = false;
	if (PROCESS_STATE_CUR_TOP == PROCESS_STATE_TOP && app == topApp) {		if (PROCESS_STATE_CUR_TOP == PROCESS_STATE_TOP && app == topApp) {
	// The last app on the list is the foreground app.
			// If specific system app has set ProcessRecord.mHasTopUi or is running a remote
			// animation (ProcessRecord.runningRemoteAnimation), this will prevent topApp
			// to use SCHED_GROUP_TOP_APP to ensure process with mHasTopUi will have exclusive
			// access to configured cores.
			if (mService.containsTopUiOrRunningRemoteAnimOrEmptyLocked(app)) {
	adj = ProcessList.FOREGROUND_APP_ADJ;		adj = ProcessList.FOREGROUND_APP_ADJ;
	schedGroup = ProcessList.SCHED_GROUP_TOP_APP;		schedGroup = ProcessList.SCHED_GROUP_TOP_APP;
	app.adjType = "top-activity";		app.adjType = "top-activity";
			} else {
			adj = ProcessList.FOREGROUND_APP_ADJ;
			schedGroup = ProcessList.SCHED_GROUP_DEFAULT;
			app.adjType = "top-activity-behind-topui";
			}
	foregroundActivities = true;		foregroundActivities = true;
	procState = PROCESS_STATE_CUR_TOP;		procState = PROCESS_STATE_CUR_TOP;
	if (DEBUG_OOM_ADJ_REASON \|\| logUid == appUid) {		if (DEBUG_OOM_ADJ_REASON \|\| logUid == appUid) {

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1268,6 +1268,7 @@ class ProcessRecord implements WindowProcessListener {
	void setHasTopUi(boolean hasTopUi) {		void setHasTopUi(boolean hasTopUi) {
	mHasTopUi = hasTopUi;		mHasTopUi = hasTopUi;
	mWindowProcessController.setHasTopUi(hasTopUi);		mWindowProcessController.setHasTopUi(hasTopUi);
			updateTopUiOrRunningRemoteAnim();
	}		}

	boolean hasTopUi() {		boolean hasTopUi() {
	@@ -1518,10 +1519,19 @@ class ProcessRecord implements WindowProcessListener {
	Slog.i(TAG, "Setting runningRemoteAnimation=" + runningRemoteAnimation		Slog.i(TAG, "Setting runningRemoteAnimation=" + runningRemoteAnimation
	+ " for pid=" + pid);		+ " for pid=" + pid);
	}		}
			updateTopUiOrRunningRemoteAnim();
	mService.updateOomAdjLocked(this, true, OomAdjuster.OOM_ADJ_REASON_UI_VISIBILITY);		mService.updateOomAdjLocked(this, true, OomAdjuster.OOM_ADJ_REASON_UI_VISIBILITY);
	}		}
	}		}

			void updateTopUiOrRunningRemoteAnim() {
			if (runningRemoteAnimation \|\| hasTopUi()) {
			mService.addTopUiOrRunningRemoteAnim(this);
			} else {
			mService.removeTopUiOrRunningRemoteAnim(this);
			}
			}

	public long getInputDispatchingTimeout() {		public long getInputDispatchingTimeout() {
	return mWindowProcessController.getInputDispatchingTimeout();		return mWindowProcessController.getInputDispatchingTimeout();
	}		}

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

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -63,6 +63,7 @@ import static com.android.server.am.ProcessList.VISIBLE_APP_ADJ;
	import static org.junit.Assert.assertEquals;		import static org.junit.Assert.assertEquals;
	import static org.junit.Assert.assertTrue;		import static org.junit.Assert.assertTrue;
	import static org.mockito.AdditionalAnswers.answer;		import static org.mockito.AdditionalAnswers.answer;
			import static org.mockito.ArgumentMatchers.eq;
	import static org.mockito.Mockito.any;		import static org.mockito.Mockito.any;
	import static org.mockito.Mockito.anyInt;		import static org.mockito.Mockito.anyInt;
	import static org.mockito.Mockito.anyLong;		import static org.mockito.Mockito.anyLong;
	@@ -170,6 +171,7 @@ public class MockingOomAdjusterTests {
	mock(OomAdjProfiler.class));		mock(OomAdjProfiler.class));
	doReturn(new ActivityManagerService.ProcessChangeItem()).when(sService)		doReturn(new ActivityManagerService.ProcessChangeItem()).when(sService)
	.enqueueProcessChangeItemLocked(anyInt(), anyInt());		.enqueueProcessChangeItemLocked(anyInt(), anyInt());
			doReturn(true).when(sService).containsTopUiOrRunningRemoteAnimOrEmptyLocked(any());
	sService.mOomAdjuster = new OomAdjuster(sService, sService.mProcessList,		sService.mOomAdjuster = new OomAdjuster(sService, sService.mProcessList,
	mock(ActiveUids.class));		mock(ActiveUids.class));
	sService.mOomAdjuster.mAdjSeq = 10000;		sService.mOomAdjuster.mAdjSeq = 10000;
	@@ -264,6 +266,21 @@ public class MockingOomAdjusterTests {
	assertProcStates(app, PROCESS_STATE_TOP_SLEEPING, VISIBLE_APP_ADJ, SCHED_GROUP_TOP_APP);		assertProcStates(app, PROCESS_STATE_TOP_SLEEPING, VISIBLE_APP_ADJ, SCHED_GROUP_TOP_APP);
	}		}

			@SuppressWarnings("GuardedBy")
			@Test
			public void testUpdateOomAdj_DoOne_TopApp_PreemptedByTopUi() {
			ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
			MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, true));
			doReturn(PROCESS_STATE_TOP).when(sService.mAtmInternal).getTopProcessState();
			doReturn(app).when(sService).getTopAppLocked();
			doReturn(false).when(sService).containsTopUiOrRunningRemoteAnimOrEmptyLocked(eq(app));
			sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
			sService.mOomAdjuster.updateOomAdjLocked(app, false, OomAdjuster.OOM_ADJ_REASON_NONE);
			doReturn(null).when(sService).getTopAppLocked();

			assertProcStates(app, PROCESS_STATE_TOP, FOREGROUND_APP_ADJ, SCHED_GROUP_DEFAULT);
			}

	@SuppressWarnings("GuardedBy")		@SuppressWarnings("GuardedBy")
	@Test		@Test
	public void testUpdateOomAdj_DoOne_RunningInstrumentation() {		public void testUpdateOomAdj_DoOne_RunningInstrumentation() {