Loading core/java/com/android/internal/app/ResolverActivity.java +10 −4 Original line number Diff line number Diff line Loading @@ -739,6 +739,11 @@ public class ResolverActivity extends Activity implements } protected UserHandle fetchPersonalProfileUserHandle() { // ActivityManager.getCurrentUser() refers to the current Foreground user. When clone/work // profile is active, we always make the personal tab from the foreground user. // Outside profiles, current foreground user is potentially the same as the sharesheet // process's user (UserHandle.myUserId()), so we continue to create personal tab with the // current foreground user. mPersonalProfileUserHandle = UserHandle.of(ActivityManager.getCurrentUser()); return mPersonalProfileUserHandle; } Loading Loading @@ -768,10 +773,11 @@ public class ResolverActivity extends Activity implements } private UserHandle fetchTabOwnerUserHandleForLaunch() { if (isLaunchedAsCloneProfile()) { return getPersonalProfileUserHandle(); } return mLaunchedFromUserHandle; // If we are in work profile's process, return WorkProfile user as owner, otherwise we // always return PersonalProfile user as owner return UserHandle.of(UserHandle.myUserId()).equals(getWorkProfileUserHandle()) ? getWorkProfileUserHandle() : getPersonalProfileUserHandle(); } private boolean hasWorkProfile() { Loading Loading
core/java/com/android/internal/app/ResolverActivity.java +10 −4 Original line number Diff line number Diff line Loading @@ -739,6 +739,11 @@ public class ResolverActivity extends Activity implements } protected UserHandle fetchPersonalProfileUserHandle() { // ActivityManager.getCurrentUser() refers to the current Foreground user. When clone/work // profile is active, we always make the personal tab from the foreground user. // Outside profiles, current foreground user is potentially the same as the sharesheet // process's user (UserHandle.myUserId()), so we continue to create personal tab with the // current foreground user. mPersonalProfileUserHandle = UserHandle.of(ActivityManager.getCurrentUser()); return mPersonalProfileUserHandle; } Loading Loading @@ -768,10 +773,11 @@ public class ResolverActivity extends Activity implements } private UserHandle fetchTabOwnerUserHandleForLaunch() { if (isLaunchedAsCloneProfile()) { return getPersonalProfileUserHandle(); } return mLaunchedFromUserHandle; // If we are in work profile's process, return WorkProfile user as owner, otherwise we // always return PersonalProfile user as owner return UserHandle.of(UserHandle.myUserId()).equals(getWorkProfileUserHandle()) ? getWorkProfileUserHandle() : getPersonalProfileUserHandle(); } private boolean hasWorkProfile() { Loading