Merge "Fix security bug for startActivityInTaskFragment" into tm-dev

2022-05-12 04:47:08 +00:00
parent dc95eae46e ae81043a32
commit bb452aa09f
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();
    }