Merge "Don't hold WM lock while updating OOM adj" (ad41c7bb) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2226,7 +2226,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		mConstants = hasHandlerThread ? new ActivityManagerConstants(this, mHandler) : null;
		final ActiveUids activeUids = new ActiveUids(this, false /* postChangesToAtm */);
		mProcessList.init(this, activeUids);
		mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids, new Object());
		mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids);

		mIntentFirewall = hasHandlerThread
		? new IntentFirewall(new IntentFirewallInterface(), mHandler) : null;
		@@ -2274,7 +2274,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		mConstants = new ActivityManagerConstants(this, mHandler);
		final ActiveUids activeUids = new ActiveUids(this, true /* postChangesToAtm */);
		mProcessList.init(this, activeUids);
		mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids, atm.getGlobalLock());
		mOomAdjuster = new OomAdjuster(this, mProcessList, activeUids);

		// Broadcast policy parameters
		final BroadcastConstants foreConstants = new BroadcastConstants(

+1 −18

Original line number	Diff line number	Diff line
		@@ -127,18 +127,8 @@ public final class OomAdjuster {
		private final ActivityManagerService mService;
		private final ProcessList mProcessList;

		/**
		* Used to lock {@link #updateOomAdjImpl} for state consistency. It also reduces frequency lock
		* and unlock when getting and setting value to {@link ProcessRecord#mWindowProcessController}.
		* Note it is declared as Object type so the locked-region-code-injection won't wrap the
		* unnecessary priority booster.
		*/
		private final Object mAtmGlobalLock;

		OomAdjuster(ActivityManagerService service, ProcessList processList, ActiveUids activeUids,
		Object atmGlobalLock) {
		OomAdjuster(ActivityManagerService service, ProcessList processList, ActiveUids activeUids) {
		mService = service;
		mAtmGlobalLock = atmGlobalLock;
		mProcessList = processList;
		mActiveUids = activeUids;

		@@ -196,13 +186,6 @@ public final class OomAdjuster {

		@GuardedBy("mService")
		final void updateOomAdjLocked() {
		synchronized (mAtmGlobalLock) {
		updateOomAdjImpl();
		}
		}

		@GuardedBy({"mService", "mAtmGlobalLock"})
		private void updateOomAdjImpl() {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "updateOomAdj");
		mService.mOomAdjProfiler.oomAdjStarted();
		final ProcessRecord TOP_APP = mService.getTopAppLocked();