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

Commit 5f804732 authored by Lee George Thomas's avatar Lee George Thomas Committed by Automerger Merge Worker
Browse files

Merge "Signal lmkd to start psi monitoring after boot." into udc-dev-plus-aosp am: 816b3904 

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



Change-Id: Id4a3d45e1fd5a8bb3d965df8c95e8bd04971fc33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcc6cb2e 816b3904

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -5061,6 +5061,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // Tell anyone interested that we are done booting!

            // Tell anyone interested that we are done booting!

            SystemProperties.set("sys.boot_completed", "1");

            SystemProperties.set("sys.boot_completed", "1");

            SystemProperties.set("dev.bootcomplete", "1");

            SystemProperties.set("dev.bootcomplete", "1");














            // Start PSI monitoring in LMKD if it was skipped earlier.














            ProcessList.startPsiMonitoringAfterBoot();
























            mUserController.onBootComplete(







            mUserController.onBootComplete(











                    new IIntentReceiver.Stub() {







                    new IIntentReceiver.Stub() {











                        @Override







                        @Override

































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



+10
−0




























Original line number
Original line
Diff line number
Diff line








@@ -357,6 +357,7 @@ public final class ProcessList {









    static final byte LMK_UPDATE_PROPS = 7;







    static final byte LMK_UPDATE_PROPS = 7;











    static final byte LMK_KILL_OCCURRED = 8; // Msg to subscribed clients on kill occurred event







    static final byte LMK_KILL_OCCURRED = 8; // Msg to subscribed clients on kill occurred event











    static final byte LMK_STATE_CHANGED = 9; // Msg to subscribed clients on state changed







    static final byte LMK_STATE_CHANGED = 9; // Msg to subscribed clients on state changed














    static final byte LMK_START_MONITORING = 9; // Start monitoring if delayed earlier































    // Low Memory Killer Daemon command codes.







    // Low Memory Killer Daemon command codes.











    // These must be kept in sync with async_event_type definitions in lmkd.h







    // These must be kept in sync with async_event_type definitions in lmkd.h










@@ -1568,6 +1569,15 @@ public final class ProcessList {









        return true;







        return true;











    }







    }


































    /**














     * {@hide}














     */














    public static void startPsiMonitoringAfterBoot() {














        ByteBuffer buf = ByteBuffer.allocate(4);














        buf.putInt(LMK_START_MONITORING);














        writeLmkd(buf, null);














    }


























    private static boolean writeLmkd(ByteBuffer buf, ByteBuffer repl) {







    private static boolean writeLmkd(ByteBuffer buf, ByteBuffer repl) {











        if (!sLmkdConnection.isConnected()) {







        if (!sLmkdConnection.isConnected()) {











            // try to connect immediately and then keep retrying







            // try to connect immediately and then keep retrying