commit 8d096d2a6d4f4d843a2b49913d4f721659213ee5
author wilsonshih <wilsonshih@google.com> Thu Aug 01 17:46:14 2019 +0800
committer Wei Sheng Shih <wilsonshih@google.com> Mon Sep 02 02:25:26 2019 +0000
tree 841529b552ba5e2bdfc45ff1f6e931a31c5fa13e
parent bb4f6c6b8fdaf3315299936b06376203513e3137

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

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index f2ca2ba8..304c0c2 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 @@
             updateOomAdj = true;
         }
         if (updateOomAdj) {
-            mH.post(mAmInternal::updateOomAdj);
+            updateOomAdj();
         }
     }