Merge "Avoid extra calls into updateOomAdj" (ef6f014a) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -604,7 +604,7 @@ public final class BroadcastQueue {
		}

		private void deliverToRegisteredReceiverLocked(BroadcastRecord r,
		BroadcastFilter filter, boolean ordered, int index) {
		BroadcastFilter filter, boolean ordered, int index, boolean skipOomAdj) {
		boolean skip = false;
		if (!mService.validateAssociationAllowedLocked(r.callerPackage, r.callingUid,
		filter.packageName, filter.owningUid)) {
		@@ -788,10 +788,12 @@ public final class BroadcastQueue {
		// are already core system stuff so don't matter for this.
		r.curApp = filter.receiverList.app;
		filter.receiverList.app.curReceivers.add(r);
		if (!skipOomAdj) {
		mService.updateOomAdjLocked(r.curApp, true,
		OomAdjuster.OOM_ADJ_REASON_START_RECEIVER);
		}
		}
		}
		try {
		if (DEBUG_BROADCAST_LIGHT) Slog.i(TAG_BROADCAST,
		"Delivering to " + filter + " : " + r);
		@@ -985,7 +987,8 @@ public final class BroadcastQueue {
		if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST,
		"Delivering non-ordered on [" + mQueueName + "] to registered "
		+ target + ": " + r);
		deliverToRegisteredReceiverLocked(r, (BroadcastFilter)target, false, i);
		deliverToRegisteredReceiverLocked(r,
		(BroadcastFilter) target, false, i, skipOomAdj);
		}
		addBroadcastToHistoryLocked(r);
		if (DEBUG_BROADCAST_LIGHT) Slog.v(TAG_BROADCAST, "Done with parallel broadcast ["
		@@ -1037,7 +1040,7 @@ public final class BroadcastQueue {
		// No more broadcasts are deliverable right now, so all done!
		mDispatcher.scheduleDeferralCheckLocked(false);
		mService.scheduleAppGcsLocked();
		if (looped) {
		if (looped && !skipOomAdj) {
		// If we had finished the last ordered broadcast, then
		// make sure all processes have correct oom and sched
		// adjustments.
		@@ -1283,7 +1286,7 @@ public final class BroadcastQueue {
		"Delivering ordered ["
		+ mQueueName + "] to registered "
		+ filter + ": " + r);
		deliverToRegisteredReceiverLocked(r, filter, r.ordered, recIdx);
		deliverToRegisteredReceiverLocked(r, filter, r.ordered, recIdx, skipOomAdj);
		if (r.receiver == null \|\| !r.ordered) {
		// The receiver has already finished, so schedule to
		// process the next one.

tests/ActivityManagerPerfTests/tests/src/com/android/frameworks/perftests/am/tests/ServiceStartPerfTest.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -25,14 +25,30 @@ import androidx.test.runner.AndroidJUnit4;

		import com.android.frameworks.perftests.am.util.Constants;
		import com.android.frameworks.perftests.am.util.TargetPackageUtils;
		import com.android.frameworks.perftests.am.util.Utils;

		import org.junit.After;
		import org.junit.Assert;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@RunWith(AndroidJUnit4.class)
		@LargeTest
		public class ServiceStartPerfTest extends BasePerfTest {
		private static final String STUB_PACKAGE_NAME =
		"com.android.frameworks.perftests.amteststestapp";

		@Before
		public void setUp() {
		super.setUp();
		Utils.runShellCommand("cmd deviceidle whitelist +" + STUB_PACKAGE_NAME);
		}

		@After
		public void tearDown() {
		Utils.runShellCommand("cmd deviceidle whitelist -" + STUB_PACKAGE_NAME);
		}

		/**
		* Tries to start the service with the given intent, throwing a RuntimeException with the