From da115ebe700f334ca9f7c8fc4e9debd77c625a82 Mon Sep 17 00:00:00 2001 From: Nicolas Prevot Date: Thu, 21 Aug 2014 14:35:57 +0100 Subject: In startActivityAsCaller, changing the way we get the userId. BUG: 17170098 Change-Id: Ie7fbd547b664a9982895b77da1fbb28df139ce52 --- services/core/java/com/android/server/am/ActivityManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services') diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index b1d84f58ea59..2ec8a0550ca4 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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. -- cgit v1.2.3-59-g8ed1b