Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87a8f61b authored by Himanshu Gupta's avatar Himanshu Gupta
Browse files

Allowing IntentPicker to be launched in single user mode. 

For Intent redirection from Private Profile to main user,
we do not want to show the work tab in intent picker,
when there are more than 1 app in main user.

In this change we pass a param to ResolverActivity, which
allows the picker sheet to be constructed in single user mode.

Before: https://photos.app.goo.gl/kg9TF5CAsgKeGkrx5
After: https://photos.app.goo.gl/UMpCebb94cxe9WHv9

Bug: 325576602
Test: Manual verification
Change-Id: I05d00a01e0bc9ab2b0f2421a4dd08936de960e0d
parent fd9010cd

core/java/com/android/internal/app/IntentForwarderActivity.java

+7 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY; 
import static android.content.pm.PackageManager.PERMISSION_GRANTED;



import static com.android.internal.app.ResolverActivity.EXTRA_CALLING_USER;

import static com.android.internal.app.ResolverActivity.EXTRA_RESTRICT_TO_SINGLE_USER;

import static com.android.internal.app.ResolverActivity.EXTRA_SELECTED_PROFILE;



import android.annotation.Nullable;
@@ -190,7 +191,7 @@ public class IntentForwarderActivity extends Activity { 
                .thenApplyAsync(targetResolveInfo -> {

                    if (isResolverActivityResolveInfo(targetResolveInfo)) {

                        launchResolverActivityWithCorrectTab(intentReceived, className, newIntent,

                                callingUserId, targetUserId);

                                callingUserId, targetUserId, false);

                    // When switching to the personal profile, automatically start the activity

                    } else if (className.equals(FORWARD_INTENT_TO_PARENT)) {

                        startActivityAsCaller(newIntent, targetUserId);
@@ -218,7 +219,7 @@ public class IntentForwarderActivity extends Activity { 
                .thenAcceptAsync(targetResolveInfo -> {

                    if (isResolverActivityResolveInfo(targetResolveInfo)) {

                        launchResolverActivityWithCorrectTab(intentReceived, className, newIntent,

                                callingUserId, targetUserId);

                                callingUserId, targetUserId, true);

                    } else {

                        maybeShowUserConsentMiniResolverPrivate(targetResolveInfo, newIntent,

                                targetUserId);
@@ -490,7 +491,7 @@ public class IntentForwarderActivity extends Activity { 
    }



    private void launchResolverActivityWithCorrectTab(Intent intentReceived, String className,

            Intent newIntent, int callingUserId, int targetUserId) {

            Intent newIntent, int callingUserId, int targetUserId, boolean singleTabOnly) {

        // When showing the intent resolver, instead of forwarding to the other profile,

        // we launch it in the current user and select the other tab. This fixes b/155874820.

        //
@@ -505,6 +506,9 @@ public class IntentForwarderActivity extends Activity { 
        sanitizeIntent(intentReceived);

        intentReceived.putExtra(EXTRA_SELECTED_PROFILE, selectedProfile);

        intentReceived.putExtra(EXTRA_CALLING_USER, UserHandle.of(callingUserId));

        if (singleTabOnly) {

            intentReceived.putExtra(EXTRA_RESTRICT_TO_SINGLE_USER, true);

        }

        startActivityAsCaller(intentReceived, null, false, userId);

        finish();

    }