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

Commit e7bf8962 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18287504



Change-Id: I8629d53429790cbe70fbe442cc8a71a272205dfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e175e5cc bb452aa0

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

+2 −0
Original line number Diff line number Diff line
@@ -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();

    }