Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81eb17e4 authored by Mathew Inwood's avatar Mathew Inwood Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib856b1f90c389281ff1195ae1cd05c87688bbc0f
parents 1d26a493 cfad04b0

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;