commit 82bb590c43c5d7779ca3ec79b06928bcad734a04
author Michal Karpinski <mkarpinski@google.com> Wed Nov 28 15:52:52 2018 +0000
committer Michal Karpinski <mkarpinski@google.com> Wed Nov 28 15:52:55 2018 +0000
tree 5d5ebd35b0068e6594f937f6ccc7ee192a96ba2f
parent 8596dedf188b2a6637bc4ad89abd19643f3c6c99

Allow background activity starts for callers that have
the same uid as the recents component

Bug: 110956953
Test: atest WmTests:ActivityStarterTests
Test: manual - both with nexuslauncher and 3P launcher
Change-Id: I4f7a9db2ad22205d37c7b9a52325011a3906c247

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
index f6ff05b..5fcc950 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
@@ -562,7 +562,7 @@
         doReturn(true).when(mService).isBackgroundActivityStartsEnabled();
 
         runAndVerifyBackgroundActivityStartsSubtest("allowed_noStartsAborted",
-                false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, false);
+                false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, false, false);
     }
 
     /**
@@ -574,7 +574,7 @@
         doReturn(false).when(mService).isBackgroundActivityStartsEnabled();
 
         runAndVerifyBackgroundActivityStartsSubtest("disallowed_unsupportedUsecase_aborted",
-                true, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, false);
+                true, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, false, false);
     }
 
     /**
@@ -587,20 +587,22 @@
         doReturn(false).when(mService).isBackgroundActivityStartsEnabled();
 
         runAndVerifyBackgroundActivityStartsSubtest("disallowed_rootUid_notAborted",
-                false, Process.ROOT_UID, false, PROCESS_STATE_TOP + 1, false);
+                false, Process.ROOT_UID, false, PROCESS_STATE_TOP + 1, false, false);
         runAndVerifyBackgroundActivityStartsSubtest("disallowed_systemUid_notAborted",
-                false, Process.SYSTEM_UID, false, PROCESS_STATE_TOP + 1, false);
+                false, Process.SYSTEM_UID, false, PROCESS_STATE_TOP + 1, false, false);
         runAndVerifyBackgroundActivityStartsSubtest("disallowed_hasVisibleWindow_notAborted",
-                false, UNIMPORTANT_UID, true, PROCESS_STATE_TOP + 1, false);
+                false, UNIMPORTANT_UID, true, PROCESS_STATE_TOP + 1, false, false);
         runAndVerifyBackgroundActivityStartsSubtest("disallowed_processStateTop_notAborted",
-                false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP, false);
+                false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP, false, false);
         runAndVerifyBackgroundActivityStartsSubtest("disallowed_hasForegroundActivities_notAborted",
-                false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, true);
+                false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, true, false);
+        runAndVerifyBackgroundActivityStartsSubtest("disallowed_callerIsRecents_notAborted",
+                false, UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1, false, true);
     }
 
     private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted,
             int testCallingUid, boolean hasVisibleWindow, int procState,
-            boolean hasForegroundActivities) {
+            boolean hasForegroundActivities, boolean callerIsRecents) {
         // window visibility
         doReturn(hasVisibleWindow).when(mService.mWindowManager).isAnyWindowVisibleForUid(
                 testCallingUid);
@@ -614,6 +616,10 @@
                 new WindowProcessController(mService, ai, null, testCallingUid, -1, null, null);
         callerApp.setHasForegroundActivities(hasForegroundActivities);
         doReturn(callerApp).when(mService).getProcessController(caller);
+        // caller is recents
+        RecentTasks recentTasks = mock(RecentTasks.class);
+        mService.mStackSupervisor.setRecentTasks(recentTasks);
+        doReturn(callerIsRecents).when(recentTasks).isCallerRecents(testCallingUid);
 
         final ActivityOptions options = spy(ActivityOptions.makeBasic());
         ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK).setCaller(caller)