Merge "In startActivityAsCaller, changing the way we get the userId." into lmp-dev

2014-08-21 18:47:35 +00:00
parent 7a346dfdd7 da115ebe70
commit fffe00dfda
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3505,7 +3505,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.