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

Commit da115ebe authored by Nicolas Prevot's avatar Nicolas Prevot
Browse files

In startActivityAsCaller, changing the way we get the userId. 

BUG: 17170098

Change-Id: Ie7fbd547b664a9982895b77da1fbb28df139ce52
parent f860be88

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

+2 −1
Original line number Diff line number Diff line
@@ -3481,7 +3481,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.