Merge "Merge "Fix security bug for startActivityInTaskFragment" into tm-dev am: bb452aa09f am: e3ceefc905 am: 0869bc5867" into tm-qpr-dev-plus-aosp

2022-05-12 05:37:18 +00:00
parent 05bb51bf41 f9e6cbdc78
commit 25d228a3cb
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
@@ -528,6 +528,8 @@ public class ActivityStartController {
                .setRequestCode(-1)
                .setCallingUid(callingUid)
                .setCallingPid(callingPid)
+                .setRealCallingUid(callingUid)
+                .setRealCallingPid(callingPid)
                .setUserId(caller != null ? caller.mUserId : mService.getCurrentUserId())
                .execute();
    }