Merge "Fix race condition in OomAdjuster." into rvc-dev am: 2a6add988c

Change-Id: I797b6875fe3b4044e5e9c9961fc7b22323d9bfed
2020-04-08 18:16:18 +00:00
parent 857c62c960 2a6add988c
commit 863ecc25df
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/OomAdjuster.java
+++ b/services/core/java/com/android/server/am/OomAdjuster.java
@@ -231,7 +231,8 @@ public final class OomAdjuster {
        final ServiceThread adjusterThread =
                new ServiceThread(TAG, TOP_APP_PRIORITY_BOOST, false /* allowIo */);
        adjusterThread.start();
-        Process.setThreadGroupAndCpuset(adjusterThread.getThreadId(), THREAD_GROUP_TOP_APP);
+        adjusterThread.getThreadHandler().post(() -> Process.setThreadGroupAndCpuset(
+                adjusterThread.getThreadId(), THREAD_GROUP_TOP_APP));
        return adjusterThread;
    }