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

Commit 7b69285f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689597

Change-Id: Ia6db57986cf4d5f37108afaca66b00fe3ffc06d1
parents 3e7ea78d 31a2e1ba

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

+0 −4
Original line number Diff line number Diff line
@@ -3043,10 +3043,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()