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

Commit 478f2542 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Initialize workProfileUserHandle before initial check for work tabs"...

Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c am: 228ba99c

Change-Id: I3bc7a0d843ac41c1b45eb8e6c7bacbceb23b8960
parents b16b1573 228ba99c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ public class ResolverActivity extends Activity implements
                : isHttpSchemeAndViewAction(getTargetIntent());

        mSupportsAlwaysUseOption = supportsAlwaysUseOption;
        mWorkProfileUserHandle = fetchWorkProfileUserProfile();

        // The last argument of createResolverListAdapter is whether to do special handling
        // of the last used choice to highlight it in the list.  We need to always
@@ -366,7 +367,6 @@ public class ResolverActivity extends Activity implements
        // to handle. We also turn it off when the work tab is shown to simplify the UX.
        boolean filterLastUsed = mSupportsAlwaysUseOption && !isVoiceInteraction()
                && !shouldShowTabs();
        mWorkProfileUserHandle = fetchWorkProfileUserProfile();
        mMultiProfilePagerAdapter = createMultiProfilePagerAdapter(initialIntents, rList, filterLastUsed);
        if (configureContentView()) {
            return;