Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f39980c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997040

Change-Id: I9d9dff6c9deb68a0ca7038a1030a54210d041e2a
This commit is contained in:
Mathew Inwood
2021-06-17 13:09:44 +00:00
committed by Automerger Merge Worker

View File

@@ -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;