Merge "Relax the lock in getMemoryStateForProcesses" into sc-dev (286f70df) · Commits · e / os / android_frameworks_base

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

+5 −7

Original line number	Diff line number	Diff line
		@@ -15548,7 +15548,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		@Override
		public List<ProcessMemoryState> getMemoryStateForProcesses() {
		List<ProcessMemoryState> processMemoryStates = new ArrayList<>();
		synchronized (mProcLock) {
		synchronized (mPidsSelfLocked) {
		for (int i = 0, size = mPidsSelfLocked.size(); i < size; i++) {
		final ProcessRecord r = mPidsSelfLocked.valueAt(i);
		@@ -15556,7 +15555,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		r.uid, r.getPid(), r.processName, r.mState.getCurAdj()));
		}
		}
		}
		return processMemoryStates;
		}