Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54fbb053 authored by Louis Chang's avatar Louis Chang
Browse files

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
parent 793c088a

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

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ public class ActivityStartController { 
                .setRequestCode(requestCode)

                .setStartFlags(startFlags)

                .setActivityOptions(options)

                .setMayWait(userId)

                .setUserId(userId)

                .setInTask(inTask)

                .setOriginatingPendingIntent(originatingPendingIntent)

                .setAllowBackgroundActivityStart(allowBackgroundActivityStart)

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

+412 −448

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −6
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                .setStartFlags(startFlags)

                .setProfilerInfo(profilerInfo)

                .setActivityOptions(bOptions)

                .setMayWait(userId)

                .setUserId(userId)

                .execute();



    }
@@ -1227,7 +1227,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    .setRequestCode(requestCode)

                    .setStartFlags(startFlags)

                    .setActivityOptions(bOptions)

                    .setMayWait(userId)

                    .setUserId(userId)

                    .setProfilerInfo(profilerInfo)

                    .setWaitResult(res)

                    .execute();
@@ -1254,7 +1254,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    .setStartFlags(startFlags)

                    .setGlobalConfiguration(config)

                    .setActivityOptions(bOptions)

                    .setMayWait(userId)

                    .setUserId(userId)

                    .execute();

        }

    }
@@ -1384,7 +1384,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    .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 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                .setStartFlags(startFlags)

                .setProfilerInfo(profilerInfo)

                .setActivityOptions(bOptions)

                .setMayWait(userId)

                .setUserId(userId)

                .setAllowBackgroundActivityStart(true)

                .execute();

    }
@@ -1448,7 +1448,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                .setCallingPackage(callingPackage)

                .setResolvedType(resolvedType)

                .setActivityOptions(bOptions)

                .setMayWait(userId)

                .setUserId(userId)

                .setAllowBackgroundActivityStart(true)

                .execute();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ class AppTaskImpl extends IAppTask.Stub { 
                .setCallingPackage(callingPackage)

                .setResolvedType(resolvedType)

                .setActivityOptions(bOptions)

                .setMayWait(callingUser)

                .setUserId(callingUser)

                .setInTask(tr)

                .execute();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ class RecentsAnimation implements RecentsAnimationCallbacks, 
                .setCallingUid(mRecentsUid)

                .setCallingPackage(mRecentsComponent.getPackageName())

                .setActivityOptions(new SafeActivityOptions(options))

                .setMayWait(mUserId)

                .setUserId(mUserId)

                .execute();

    }