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

Commit 7c510c22 authored by arangelov's avatar arangelov
Browse files

Also call Intent#fixUris for the intent resolver case 

Fixes: 158082179
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: I74c97f5d2f3bbbcd35df20151a455877562f34ad
parent 53e36247

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

+0 −4
Original line number Diff line number Diff line
@@ -3027,10 +3027,6 @@ public class ChooserActivity extends ResolverActivity implements 
        currentRootAdapter.updateDirectShareExpansion();

    }



    void prepareIntentForCrossProfileLaunch(Intent intent) {

        intent.fixUris(UserHandle.myUserId());

    }



    @Override

    protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {

        if (shouldShowTabs()) {

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

+3 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,9 @@ public class ResolverActivity extends Activity implements 
        return true;

    }



    void prepareIntentForCrossProfileLaunch(Intent intent) {}

    private void prepareIntentForCrossProfileLaunch(Intent intent) {

        intent.fixUris(UserHandle.myUserId());

    }



    private boolean isLaunchingTargetInOtherProfile() {

        return mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier()