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

Commit f4dbcb64 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 029675e5: Merge "Fix launching activity from a pending intent" into jb-mr1-dev 

* commit '029675e5':
  Fix launching activity from a pending intent
parents 5dd7b11e 029675e5

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

+1 −2
Original line number Diff line number Diff line
@@ -2539,7 +2539,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
        

        // This is so super not safe, that only the system (or okay root)

        // can do it.

        int userId = Binder.getOrigCallingUser();

        final int callingUid = Binder.getCallingUid();

        if (callingUid != 0 && callingUid != Process.myUid()) {

            throw new SecurityException(
@@ -2548,7 +2547,7 @@ public final class ActivityManagerService extends ActivityManagerNative 














        int ret = mMainStack.startActivityMayWait(null, uid, intent, resolvedType,















                resultTo, resultWho, requestCode, startFlags,













                null, null, null, null, options, userId);













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















        return ret;















    }