Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-08-21 14:19:51 -07:00
committed by Android (Google) Code Review
parent 2253eeab6c a10d1aa6c7
commit 23e282554e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -3014,8 +3014,8 @@ final class ActivityStack {
// Collect information about the target of the Intent.
ActivityInfo aInfo = resolveActivity(intent, resolvedType, startFlags,
profileFile, profileFd, userId);
if (aInfo != null && mService.isSingleton(aInfo.processName, aInfo.applicationInfo,
null, 0)) {
if (aInfo != null && (aInfo.flags & ActivityInfo.FLAG_MULTIPROCESS) == 0
&& mService.isSingleton(aInfo.processName, aInfo.applicationInfo, null, 0)) {
userId = 0;
}
aInfo = mService.getActivityInfoForUser(aInfo, userId);