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

Commit 49abbf0d authored by Nan Wu's avatar Nan Wu Committed by Android (Google) Code Review
Browse files

Merge "Fix missing creator token error" into main

parents 2546a4c2 5ba04ee6

core/java/android/service/games/GameSession.java

+2 −0
Original line number Diff line number Diff line
@@ -516,6 +516,8 @@ public abstract class GameSession { 
                        options,

                        future);



        trampolineIntent.collectExtraIntentKeys();



        try {

            int result = ActivityTaskManager.getService().startActivityFromGameSession(

                    mContext.getIApplicationThread(), mContext.getPackageName(), "GameSession",

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

+2 −0
Original line number Diff line number Diff line
@@ -1854,6 +1854,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        }

        assertPackageMatchesCallingUid(callingPackage);



        mAmInternal.addCreatorToken(intent, callingPackage);



        final ActivityOptions activityOptions = ActivityOptions.makeBasic();

        activityOptions.setLaunchTaskId(taskId);

        // Pass in the system UID to allow setting launch taskId with MANAGE_GAME_ACTIVITY.