Merge "Reduce the scope of holding the mPidsSelfLocked lock" into main (2dc7b8b3) · Commits · e / os / android_frameworks_base

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

+32 −31

Original line number	Diff line number	Diff line
		@@ -6025,11 +6025,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		synchronized (mProcLock) {
		synchronized (mPidsSelfLocked) {
		int newestTimeIndex = -1;
		long newestTime = Long.MIN_VALUE;
		for (int i = 0; i < pids.length; i++) {
		ProcessRecord pr = mPidsSelfLocked.get(pids[i]);
		final ProcessRecord pr;
		synchronized (mPidsSelfLocked) {
		pr = mPidsSelfLocked.get(pids[i]);
		}
		if (pr != null) {
		final long pendingTopTime =
		mPendingStartActivityUids.getPendingTopPidTime(pr.uid, pids[i]);
		@@ -6066,7 +6068,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}
		}
		}

		// =========================================================
		// PERMISSIONS