diff options
| -rw-r--r-- | core/java/android/service/games/GameSession.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskManagerService.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/service/games/GameSession.java b/core/java/android/service/games/GameSession.java index e8d53d351795..531e0b11996a 100644 --- a/core/java/android/service/games/GameSession.java +++ b/core/java/android/service/games/GameSession.java @@ -516,6 +516,8 @@ public abstract class GameSession { options, future); + trampolineIntent.collectExtraIntentKeys(); + try { int result = ActivityTaskManager.getService().startActivityFromGameSession( mContext.getIApplicationThread(), mContext.getPackageName(), "GameSession", diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 0745fecdcd76..73f15f982f7d 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -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. |