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

Commit d6e55406 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Refactor start activity methods"

parents 3e65b926 54fbb053

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

                .setProfilerInfo(profilerInfo)

                .setActivityOptions(bOptions)

                .setMayWait(userId)

                .setUserId(userId)

                .execute();



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

                    .setStartFlags(startFlags)

                    .setActivityOptions(bOptions)

                    .setMayWait(userId)

                    .setUserId(userId)

                    .setProfilerInfo(profilerInfo)

                    .setWaitResult(res)

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

                    .setGlobalConfiguration(config)

                    .setActivityOptions(bOptions)

                    .setMayWait(userId)

                    .setUserId(userId)

                    .execute();

        }

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

                .setProfilerInfo(profilerInfo)

                .setActivityOptions(bOptions)

                .setMayWait(userId)

                .setUserId(userId)

                .setAllowBackgroundActivityStart(true)

                .execute();

    }
@@ -1453,7 +1453,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();

    }