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

Commit dc3ba8da authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Fix the flaky sched group with the BIND_SCHEDULE_LIKE_TOP_APP" into main

parents 07c97efe 272addb1

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

+1 −3
Original line number Diff line number Diff line
@@ -2823,9 +2823,7 @@ public class OomAdjuster { 
                }

            }



            if (schedGroup < SCHED_GROUP_TOP_APP

                    && cr.hasFlag(Context.BIND_SCHEDULE_LIKE_TOP_APP)

                    && clientIsSystem) {

            if (cr.hasFlag(Context.BIND_SCHEDULE_LIKE_TOP_APP) && clientIsSystem) {

                schedGroup = SCHED_GROUP_TOP_APP;

                state.setScheduleLikeTopApp(true);

            }

services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java

+7 −0
Original line number Diff line number Diff line
@@ -1895,6 +1895,13 @@ public class MockingOomAdjusterTests { 
        assertProcStates(app2, PROCESS_STATE_FOREGROUND_SERVICE, PERCEPTIBLE_APP_ADJ,

                SCHED_GROUP_DEFAULT);

        assertBfsl(app2);



        bindService(client2, app1, null, 0, mock(IBinder.class));

        bindService(app1, client2, null, 0, mock(IBinder.class));

        client2.mServices.setHasForegroundServices(false, 0, /* hasNoneType=*/false);

        updateOomAdj(app1, client1, client2);

        assertProcStates(app1, PROCESS_STATE_IMPORTANT_FOREGROUND, VISIBLE_APP_ADJ,

                SCHED_GROUP_TOP_APP);

    }



    @SuppressWarnings("GuardedBy")