From 8d096d2a6d4f4d843a2b49913d4f721659213ee5 Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Thu, 1 Aug 2019 17:46:14 +0800
Subject: [PATCH] Prevent LocalService#updateOomAdj been called during test

When testing, we mock WindowProcessController#mOwner as Object, if
updateOomAdj is called during test, then the test process will crash.
This won't happen in normal use.
To prevent the test process from crash, mock out ATMS#updateOomAdj()
during test.

Fix: 138770685
Test: atest WmTests
Change-Id: Ibc8e56e6fd9b332d987c7cd2ed501aba4394f7a2
---
 .../java/com/android/server/wm/ActivityTaskManagerService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index f2ca2ba82dfb4..304c0c210a797 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -5460,7 +5460,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
             updateOomAdj = true;
         }
         if (updateOomAdj) {
-            mH.post(mAmInternal::updateOomAdj);
+            updateOomAdj();
         }
     }