Merge "Fix launching activity from a pending intent" into jb-mr1-dev

Author: Amith Yamasani

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

@@ -2539,7 +2539,6 @@ public final int startActivityInPackage(int uid,
 
         // 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 int startActivityInPackage(int uid,
 
         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;
     }