Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If37f0a98a3977a8151ff3abe232802dc74e5c69b
This commit is contained in:
Mathew Inwood
2021-06-17 13:25:01 +00:00
committed by Automerger Merge Worker
parent e92050f998 6ea95fa4d2
commit dd7d22b8e0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/OomAdjuster.java
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;