summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java8
-rw-r--r--services/core/java/com/android/server/am/OomAdjuster.java7
-rw-r--r--services/core/java/com/android/server/am/flags.aconfig7
3 files changed, 0 insertions, 22 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index f34016905502..6e3d7bd19b41 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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);
}
diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java
index cd40905b01da..61c5501a7b5a 100644
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -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);
}
}
diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig
index e89889e794ba..2beeea7ef89e 100644
--- a/services/core/java/com/android/server/am/flags.aconfig
+++ b/services/core/java/com/android/server/am/flags.aconfig
@@ -205,13 +205,6 @@ flag {
}
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"
description: "Migrate OomAdjuster pulled device state to a push model"