commit 54fbb053547955ffcd1e9d0f2193968f4ca69021
author Louis Chang <louischang@google.com> Wed Oct 16 17:10:17 2019 +0800
committer Louis Chang <louischang@google.com> Fri Oct 25 12:29:46 2019 +0800
tree 9ac37a693ffae4a032af55daa81ec22041667853
parent 793c088a7eddc3080f5f2b8074e7c6d7677a1026

Refactor start activity methods

There were several startActivity* methods that looks similar, but not
entirely the same. Re-organized the code flow and remove some confused
methods, like setMayWait(), to make people easier to follow.

Bug: 139449647
Test: atest WmTests CtsWindowManagerDeviceTestCases
Change-Id: If1c3cc2bef9fbeecde9ec456515c9979b8286f97

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 14df505..ba825725 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -1056,7 +1056,7 @@
                 .setStartFlags(startFlags)
                 .setProfilerInfo(profilerInfo)
                 .setActivityOptions(bOptions)
-                .setMayWait(userId)
+                .setUserId(userId)
                 .execute();
 
     }
@@ -1227,7 +1227,7 @@
                     .setRequestCode(requestCode)
                     .setStartFlags(startFlags)
                     .setActivityOptions(bOptions)
-                    .setMayWait(userId)
+                    .setUserId(userId)
                     .setProfilerInfo(profilerInfo)
                     .setWaitResult(res)
                     .execute();
@@ -1254,7 +1254,7 @@
                     .setStartFlags(startFlags)
                     .setGlobalConfiguration(config)
                     .setActivityOptions(bOptions)
-                    .setMayWait(userId)
+                    .setUserId(userId)
                     .execute();
         }
     }
@@ -1384,7 +1384,7 @@
                     .setRequestCode(requestCode)
                     .setStartFlags(startFlags)
                     .setActivityOptions(bOptions)
-                    .setMayWait(userId)
+                    .setUserId(userId)
                     .setIgnoreTargetSecurity(ignoreTargetSecurity)
                     .setFilterCallingUid(isResolver ? 0 /* system */ : targetUid)
                     // The target may well be in the background, which would normally prevent it
@@ -1432,7 +1432,7 @@
                 .setStartFlags(startFlags)
                 .setProfilerInfo(profilerInfo)
                 .setActivityOptions(bOptions)
-                .setMayWait(userId)
+                .setUserId(userId)
                 .setAllowBackgroundActivityStart(true)
                 .execute();
     }
@@ -1448,7 +1448,7 @@
                 .setCallingPackage(callingPackage)
                 .setResolvedType(resolvedType)
                 .setActivityOptions(bOptions)
-                .setMayWait(userId)
+                .setUserId(userId)
                 .setAllowBackgroundActivityStart(true)
                 .execute();
     }