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

Commit 91848e4a authored by Hugo Benichi's avatar Hugo Benichi Committed by Android (Google) Code Review
Browse files

Merge "am: hide details of OomAdjObserver from OomAdjuster" into main

parents b6d2f9d3 6127b8af

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

+8 −0
Original line number Diff line number Diff line
@@ -3244,6 +3244,14 @@ public class ActivityManagerService extends IActivityManager.Stub 
        }

    }













    void reportOomAdjMessageLocked(String msg) {













        synchronized (mOomAdjObserverLock) {













            if (mCurOomAdjObserver != null) {













                mUiHandler.obtainMessage(DISPATCH_OOM_ADJ_OBSERVER_MSG, msg).sendToTarget();













            }













        }













    }



























    /**















     * @deprecated use {@link #startActivityWithFeature} instead















     */

































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



+1
−7




























Original line number
Diff line number
Diff line








@@ -77,7 +77,6 @@ import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PROCESS_OBS













import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_PSS;















import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_UID_OBSERVERS;















import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_USAGE_STATS;













import static com.android.server.am.ActivityManagerService.DISPATCH_OOM_ADJ_OBSERVER_MSG;















import static com.android.server.am.ActivityManagerService.FOLLOW_UP_OOMADJUSTER_UPDATE_MSG;















import static com.android.server.am.ActivityManagerService.IDLE_UIDS_MSG;















import static com.android.server.am.ActivityManagerService.TAG_LRU;










@@ -2187,12 +2186,7 @@ public abstract class OomAdjuster {













    @GuardedBy("mService")















    protected void reportOomAdjMessageLocked(String tag, String msg) {















        Slog.d(tag, msg);













        synchronized (mService.mOomAdjObserverLock) {













            if (mService.mCurOomAdjObserver != null) {













                mService.mUiHandler.obtainMessage(DISPATCH_OOM_ADJ_OBSERVER_MSG, msg)













                        .sendToTarget();













            }













        }













        mService.reportOomAdjMessageLocked(msg);















    }































    void onWakefulnessChanged(int wakefulness) {