Merge "Fix security bug for startActivityInTaskFragment" into tm-dev am: bb452aa09f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18287504 Change-Id: I90446d5cd5c59999866489b176d137152a289019 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:11:01 +00:00
parent 1c2ec15277 bb452aa09f
commit e3ceefc905
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/ActivityStartController.java
+++ b/services/core/java/com/android/server/wm/ActivityStartController.java
@@ -518,6 +518,8 @@ public class ActivityStartController {
                .setRequestCode(-1)
                .setCallingUid(callingUid)
                .setCallingPid(callingPid)
+                .setRealCallingUid(callingUid)
+                .setRealCallingPid(callingPid)
                .setUserId(caller != null ? caller.mUserId : mService.getCurrentUserId())
                .execute();
    }