resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp (b8c6405f) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1820,7 +1820,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (cr.binding != null && cr.binding.service != null
		&& cr.binding.service.app != null
		&& cr.binding.service.app.lruSeq != mLruSeq) {
		updateLruProcessInternalLocked(cr.binding.service.app, oomAdj,
		updateLruProcessInternalLocked(cr.binding.service.app, false,
		updateActivityTime, i+1);
		}
		}
		@@ -1828,7 +1828,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		for (int j=app.conProviders.size()-1; j>=0; j--) {
		ContentProviderRecord cpr = app.conProviders.get(j).provider;
		if (cpr.proc != null && cpr.proc.lruSeq != mLruSeq) {
		updateLruProcessInternalLocked(cpr.proc, oomAdj,
		updateLruProcessInternalLocked(cpr.proc, false,
		updateActivityTime, i+1);
		}
		}