commit a6191b4fa1255f334afbfad15faf00423934a463
author Wale Ogunwale <ogunwale@google.com> Wed May 09 07:41:32 2018 -0700
committer Wale Ogunwale <ogunwale@google.com> Thu Jun 21 15:11:21 2018 -0700
tree 97accfb14093cde13a4e345b50be9027bb181690
parent 553ac6feb35ee0c18226489763649ea865a117c1

Moved more stuff from ActivityManagerService to ActivityTaskManagerService (9/n)

Moved more stuff related to activities out of the current service to the new one.

Test: Existing tests pass
Test: go/wm-smoke-auto
Bug: 80414790
Change-Id: I16863dd977bf09136cc23b0ab3aa197c613879ea

services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java

diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java
index 10d255e..274d9e5 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java
@@ -236,8 +236,8 @@
         }
 
         if (containsConditions(preconditions, PRECONDITION_DISALLOW_APP_SWITCHING)) {
-            doReturn(false).when(service).checkAppSwitchAllowedLocked(anyInt(), anyInt(), anyInt(),
-                    anyInt(), any());
+            doReturn(false).when(service.mActivityTaskManager).checkAppSwitchAllowedLocked(
+                    anyInt(), anyInt(), anyInt(), anyInt(), any());
         }
 
         if (containsConditions(preconditions,PRECONDITION_CANNOT_START_ANY_ACTIVITY)) {