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

Commit 3d3dec07 authored by Xin Guan's avatar Xin Guan Committed by Automerger Merge Worker
Browse files

Merge "Don't update oom adj if there is no wakefulness change" into udc-dev am: 9f5c62cf 

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



Change-Id: Ice993eb08a944dd86f1e67193f56f78de7c4375c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6090e615 9f5c62cf

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

+2 −1
Original line number Diff line number Diff line
@@ -6984,10 +6984,11 @@ public class ActivityManagerService extends IActivityManager.Stub 
                mActivityTaskManager.onScreenAwakeChanged(isAwake);

                mOomAdjProfiler.onWakefulnessChanged(wakefulness);

                mOomAdjuster.onWakefulnessChanged(wakefulness);

            }















                updateOomAdjLocked(OomAdjuster.OOM_ADJ_REASON_UI_VISIBILITY);















            }















        }













    }





























    @Override















    public void notifyCleartextNetwork(int uid, byte[] firstPacket) {