Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c63 am: 228ba99ce7 am: 509cda43cb

Change-Id: If2dfe9b6a4680c21bfd21db451ef3c2ec987eef7

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

@@ -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;