Skip to content

Commit a10d1aa

Browse files
author
Amith Yamasani
committed
Multiprocess activity should be allowed to run on current user
Multiprocess flag should override singleton checks. This allows ChooserActivity to run in the process/user that launched it. Wallpaper chooser from Launcher now works for secondary users. Change-Id: I17a99278ed2a6d2491c3016a549134a85bc2af00
1 parent 091d56c commit a10d1aa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

services/java/com/android/server/am/ActivityStack.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3014,8 +3014,8 @@ final int startActivityMayWait(IApplicationThread caller, int callingUid,
30143014
// Collect information about the target of the Intent.
30153015
ActivityInfo aInfo = resolveActivity(intent, resolvedType, startFlags,
30163016
profileFile, profileFd, userId);
3017-
if (aInfo != null && mService.isSingleton(aInfo.processName, aInfo.applicationInfo,
3018-
null, 0)) {
3017+
if (aInfo != null && (aInfo.flags & ActivityInfo.FLAG_MULTIPROCESS) == 0
3018+
&& mService.isSingleton(aInfo.processName, aInfo.applicationInfo, null, 0)) {
30193019
userId = 0;
30203020
}
30213021
aInfo = mService.getActivityInfoForUser(aInfo, userId);

0 commit comments

Comments
 (0)