From 528b18b3f0c6981f52d0e0830571485325cb040d Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Wed, 18 Apr 2018 09:43:39 -0700
Subject: [PATCH] ActivityManagerService: ensure updateOomAdjLocked gets called
 early

If updateOomAdjLocked isn't called before android.bg is put into the bg
cpuset, then updateOomAdjLocked will put android.bg in the fg cpuset.

Test: boots
Bug: 77908520
Change-Id: If88a6a59f4ca4fe7d1c6ed149f59282aad26600a
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 3d620f20bc064..bf647fddbdcee 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3161,6 +3161,8 @@ public class ActivityManagerService extends IActivityManager.Stub
 
         // bind background thread to little cores
         // this is expected to fail inside of framework tests because apps can't touch cpusets directly
+        // make sure we've already adjusted system_server's internal view of itself first
+        updateOomAdjLocked();
         try {
             Process.setThreadGroupAndCpuset(BackgroundThread.get().getThreadId(),
                     Process.THREAD_GROUP_BG_NONINTERACTIVE);