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

Commit 0d848262 authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove SCHED_RESET_ON_FORK flag" into main

parents 2de569f5 13a4fe3f

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

+0 −8
Original line number Diff line number Diff line
@@ -8315,14 +8315,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        setThreadScheduler(proc.getRenderThreadTid(),

                                SCHED_FIFO | SCHED_RESET_ON_FORK, 1);

                    } else {

                        if (Flags.resetOnForkEnabled()) {

                            if (Process.getThreadScheduler(proc.getRenderThreadTid())

                                    == Process.SCHED_OTHER) {

                                Process.setThreadScheduler(proc.getRenderThreadTid(),

                                    Process.SCHED_OTHER | Process.SCHED_RESET_ON_FORK,

                                    0);

                            }

                        }

                        setThreadPriority(proc.getRenderThreadTid(),

                            THREAD_PRIORITY_TOP_APP_BOOST);

                    }

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

+0 −7
Original line number Diff line number Diff line
@@ -471,13 +471,6 @@ public class OomAdjuster { 
        }



        void setThreadPriority(int tid, int priority) {

            if (Flags.resetOnForkEnabled()) {

                if (Process.getThreadScheduler(tid) == Process.SCHED_OTHER) {

                    Process.setThreadScheduler(tid,

                        Process.SCHED_OTHER | Process.SCHED_RESET_ON_FORK,

                        0);

                }

            }

            Process.setThreadPriority(tid, priority);

        }

    }

services/core/java/com/android/server/am/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -204,13 +204,6 @@ flag { 
    bug: "326315985"

}



flag {

    name: "reset_on_fork_enabled"

    namespace: "system_performance"

    description: "Set reset_on_fork flag."

    bug: "370988407"

}



flag {

    name: "push_global_state_to_oomadjuster"

    namespace: "backstage_power"