Merge "Use non-logging compat framework calls" into sc-dev (4d4f3998) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -328,7 +328,8 @@ public class OomAdjuster {
		final int index = mCache.indexOfKey(app.packageName);
		Pair<Boolean, WeakReference<ApplicationInfo>> p;
		if (index < 0) {
		p = new Pair<>(mPlatformCompat.isChangeEnabled(mChangeId, app),
		p = new Pair<>(mPlatformCompat.isChangeEnabledInternalNoLogging(mChangeId,
		app),
		new WeakReference<>(app));
		mCache.put(app.packageName, p);
		return p.first;
		@@ -338,7 +339,8 @@ public class OomAdjuster {
		return p.first;
		}
		// Cache is invalid, regenerate it
		p = new Pair<>(mPlatformCompat.isChangeEnabled(mChangeId, app),
		p = new Pair<>(mPlatformCompat.isChangeEnabledInternalNoLogging(mChangeId,
		app),
		new WeakReference<>(app));
		mCache.setValueAt(index, p);
		return p.first;