Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into mnc-dev (aac4c5c2) · Commits · e / os / android_frameworks_base

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

+15 −13

Original line number	Diff line number	Diff line
		@@ -3615,7 +3615,8 @@ public final class ActivityManagerService extends ActivityManagerNative

		@Override
		public boolean setProcessMemoryTrimLevel(String process, int userId, int level) {
		ProcessRecord app = getProcessRecordLocked(process, userId, true);
		synchronized (this) {
		final ProcessRecord app = getProcessRecordLocked(process, userId, true);
		if (app == null) {
		return false;
		}
		@@ -3630,6 +3631,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		// Fallthrough to failure case.
		}
		}
		}
		return false;
		}