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

Commit a4fe4bd9 authored by Liahav Eitan's avatar Liahav Eitan
Browse files

[2/2] Fix sharing to another profile where an app has multiple targets 

Complete the change in ag/19657256 to also apply in SelectableTargetInfo.
That would ensure that in all cases of cross-profile targets the URIs
are fixed to include the user-id prefix.

Bug:244876518
Bug:242605257
Test: manually share image from work Photos app to personal WhatsApp's
frequent contact target.

Change-Id: Ib41c8a3c46afcc2d62a4c1a924212bcd98bcfbe4
parent 6bf944b7

core/java/com/android/internal/app/chooser/DisplayResolveInfo.java

+2 −9
Original line number Diff line number Diff line
@@ -172,14 +172,14 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable { 


    @Override

    public boolean startAsCaller(ResolverActivity activity, Bundle options, int userId) {

        prepareIntentForCrossProfileLaunch(mResolvedIntent, userId);

        TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, userId);

        activity.startActivityAsCaller(mResolvedIntent, options, false, userId);

        return true;

    }



    @Override

    public boolean startAsUser(Activity activity, Bundle options, UserHandle user) {

        prepareIntentForCrossProfileLaunch(mResolvedIntent, user.getIdentifier());

        TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, user.getIdentifier());

        activity.startActivityAsUser(mResolvedIntent, options, user);

        return false;

    }
@@ -224,13 +224,6 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable { 
        }

    };



    private static void prepareIntentForCrossProfileLaunch(Intent intent, int targetUserId) {

        final int currentUserId = UserHandle.myUserId();

        if (targetUserId != currentUserId) {

            intent.fixUris(currentUserId);

        }

    }



    private DisplayResolveInfo(Parcel in) {

        mDisplayLabel = in.readCharSequence();

        mExtendedInfo = in.readCharSequence();

core/java/com/android/internal/app/chooser/SelectableTargetInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ public final class SelectableTargetInfo implements ChooserTargetInfo { 
        }

        intent.setComponent(mChooserTarget.getComponentName());

        intent.putExtras(mChooserTarget.getIntentExtras());

        TargetInfo.prepareIntentForCrossProfileLaunch(intent, userId);



        // Important: we will ignore the target security checks in ActivityManager

        // if and only if the ChooserTarget's target package is the same package

core/java/com/android/internal/app/chooser/TargetInfo.java

+11 −0
Original line number Diff line number Diff line
@@ -130,4 +130,15 @@ public interface TargetInfo { 
     * @return true if this target should be pinned to the front by the request of the user

     */

    boolean isPinned();



    /**

     * Fix the URIs in {@code intent} if cross-profile sharing is required. This should be called

     * before launching the intent as another user.

     */

    static void prepareIntentForCrossProfileLaunch(Intent intent, int targetUserId) {

        final int currentUserId = UserHandle.myUserId();

        if (targetUserId != currentUserId) {

            intent.fixUris(currentUserId);

        }

    }

}