Merge "OomAdjuster: Don't reset raw adj if it has been evaluated" (17f25028) · Commits · e / os / android_frameworks_base

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

+17 −6

Original line number	Diff line number	Diff line
		@@ -376,7 +376,11 @@ public final class OomAdjuster {
		ConnectionRecord cr = pr.connections.valueAt(i);
		ProcessRecord service = (cr.flags & ServiceInfo.FLAG_ISOLATED_PROCESS) != 0
		? cr.binding.service.isolatedProc : cr.binding.service.app;
		if (service == null \|\| service == pr \|\| (containsCycle \|= service.mReachable)) {
		if (service == null \|\| service == pr) {
		continue;
		}
		containsCycle \|= service.mReachable;
		if (service.mReachable) {
		continue;
		}
		if ((cr.flags & (Context.BIND_WAIVE_PRIORITY
		@@ -394,6 +398,10 @@ public final class OomAdjuster {
		if (provider == null \|\| provider == pr \|\| (containsCycle \|= provider.mReachable)) {
		continue;
		}
		containsCycle \|= provider.mReachable;
		if (provider.mReachable) {
		continue;
		}
		queue.offer(provider);
		provider.mReachable = true;
		}
		@@ -482,13 +490,16 @@ public final class OomAdjuster {
		// need to reset cycle state before calling computeOomAdjLocked because of service conns
		for (int i = numProc - 1; i >= 0; i--) {
		ProcessRecord app = activeProcesses.get(i);
		app.containsCycle = false;
		app.mReachable = false;
		// No need to compute again it has been evaluated in previous iteration
		if (app.adjSeq != mAdjSeq) {
		app.containsCycle = false;
		app.setCurRawProcState(PROCESS_STATE_CACHED_EMPTY);
		app.setCurRawAdj(ProcessList.UNKNOWN_ADJ);
		app.setCapability = PROCESS_CAPABILITY_NONE;
		app.resetCachedInfo();
		}
		}
		for (int i = numProc - 1; i >= 0; i--) {
		ProcessRecord app = activeProcesses.get(i);
		if (!app.killedByAm && app.thread != null) {

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

+29 −0

Original line number	Diff line number	Diff line
		@@ -1051,6 +1051,35 @@ public class MockingOomAdjusterTests {
		assertEquals(PROCESS_STATE_CACHED_EMPTY, app.setProcState);
		}

		@SuppressWarnings("GuardedBy")
		@Test
		public void testUpdateOomAdj_DoOne_Service_Chain_BoundByFgService_Cycle_2() {
		ProcessRecord app = spy(makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID,
		MOCKAPP_PROCESSNAME, MOCKAPP_PACKAGENAME, false));
		ProcessRecord client = spy(makeDefaultProcessRecord(MOCKAPP2_PID, MOCKAPP2_UID,
		MOCKAPP2_PROCESSNAME, MOCKAPP2_PACKAGENAME, false));
		bindService(app, client, null, 0, mock(IBinder.class));
		bindService(client, app, null, 0, mock(IBinder.class));
		ProcessRecord client2 = spy(makeDefaultProcessRecord(MOCKAPP3_PID, MOCKAPP3_UID,
		MOCKAPP3_PROCESSNAME, MOCKAPP3_PACKAGENAME, false));
		bindService(client2, client, null, 0, mock(IBinder.class));
		client.setHasForegroundServices(true, 0);
		ArrayList<ProcessRecord> lru = sService.mProcessList.mLruProcesses;
		lru.clear();
		lru.add(app);
		lru.add(client);
		lru.add(client2);
		sService.mWakefulness = PowerManagerInternal.WAKEFULNESS_AWAKE;
		sService.mOomAdjuster.updateOomAdjLocked(app, true, OomAdjuster.OOM_ADJ_REASON_NONE);

		assertProcStates(app, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
		SCHED_GROUP_DEFAULT);
		assertProcStates(client, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
		SCHED_GROUP_DEFAULT);
		assertProcStates(client2, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,
		SCHED_GROUP_DEFAULT);
		}

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