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

Commit fffe00df authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev

parents 7a346dfd da115ebe

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -3505,7 +3505,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
        try {

            int ret = mStackSupervisor.startActivityMayWait(null, targetUid, targetPackage, intent,

                    resolvedType, null, null, resultTo, resultWho, requestCode, startFlags,

                    null, null, null, null, options, UserHandle.getUserId(targetUid), null);

                    null, null, null, null, options, UserHandle.getUserId(sourceRecord.app.uid),

                    null);

            return ret;

        } catch (SecurityException e) {

            // XXX need to figure out how to propagate to original app.