From 7300dbeba06a85948d63e480da36258d78840b30 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 17 Aug 2012 14:17:57 -0700 Subject: [PATCH] Fix launching activity from a pending intent The creator of the pending intent is the user on which the activity should be launched. Change-Id: I733326ed8a5784985ac93a84ce91de4dda17c730 --- .../java/com/android/server/am/ActivityManagerService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 5e85e1a4b892e..944fd6b1c7e41 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -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; }