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

Commit 4cc313e0 authored by Nick Chameyev's avatar Nick Chameyev
Browse files

Extract getIntentUser function in ResolverActivity 

This should resolve conflicts with master.

Bug: 233348916
Test: presubmit
Change-Id: If5bf5c73441dc9c54822d0c2b36f16b11ea892ec
Merged-In: If5bf5c73441dc9c54822d0c2b36f16b11ea892ec
parent 1b5ae517

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

+7 −3
Original line number Diff line number Diff line
@@ -492,6 +492,12 @@ public class ResolverActivity extends Activity implements 
                /* workProfileUserHandle= */ null);

    }



    private UserHandle getIntentUser() {

        return getIntent().hasExtra(EXTRA_CALLING_USER)

                ? getIntent().getParcelableExtra(EXTRA_CALLING_USER)

                : getUser();

    }



    private ResolverMultiProfilePagerAdapter createResolverMultiProfilePagerAdapterForTwoProfiles(

            Intent[] initialIntents,

            List<ResolveInfo> rList,
@@ -500,9 +506,7 @@ public class ResolverActivity extends Activity implements 
        // the intent resolver is started in the other profile. Since this is the only case when

        // this happens, we check for it here and set the current profile's tab.

        int selectedProfile = getCurrentProfile();

        UserHandle intentUser = getIntent().hasExtra(EXTRA_CALLING_USER)

                ? getIntent().getParcelableExtra(EXTRA_CALLING_USER)

                : getUser();

        UserHandle intentUser = getIntentUser();

        if (!getUser().equals(intentUser)) {

            if (getPersonalProfileUserHandle().equals(intentUser)) {

                selectedProfile = PROFILE_PERSONAL;