Merge "Use non-logging compat framework calls" into sc-dev

This commit is contained in:
Mathew Inwood
2021-06-17 12:46:07 +00:00
committed by Android (Google) Code Review

View File

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