diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-08-21 14:35:57 +0100 |
|---|---|---|
| committer | Nicolas Prevot <nprevot@google.com> | 2014-08-21 14:40:06 +0100 |
| commit | da115ebe700f334ca9f7c8fc4e9debd77c625a82 (patch) | |
| tree | 5a5c0a75f47a7356e58b4a1718a42bc904811b95 /services | |
| parent | f860be88a9c8fca910f2d97694d102f627d06c71 (diff) | |
| download | frameworks_base-da115ebe700f334ca9f7c8fc4e9debd77c625a82.zip frameworks_base-da115ebe700f334ca9f7c8fc4e9debd77c625a82.tar.gz frameworks_base-da115ebe700f334ca9f7c8fc4e9debd77c625a82.tar.bz2 | |
In startActivityAsCaller, changing the way we get the userId.
BUG: 17170098
Change-Id: Ie7fbd547b664a9982895b77da1fbb28df139ce52
Diffstat (limited to 'services')
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index b1d84f5..2ec8a05 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. |