Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev

Browse Source
This commit is contained in:
Antoan Angelov
2020-05-13 18:06:06 +00:00
committed by Android (Google) Code Review
parent 43d32906a8 8519218a73
commit b98da91c63
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -358,6 +358,7 @@ public class ResolverActivity extends Activity implements
: isHttpSchemeAndViewAction(getTargetIntent()); : isHttpSchemeAndViewAction(getTargetIntent());
mSupportsAlwaysUseOption = supportsAlwaysUseOption; mSupportsAlwaysUseOption = supportsAlwaysUseOption;
mWorkProfileUserHandle = fetchWorkProfileUserProfile();
// The last argument of createResolverListAdapter is whether to do special handling // 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 // 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. // to handle. We also turn it off when the work tab is shown to simplify the UX.
boolean filterLastUsed = mSupportsAlwaysUseOption && !isVoiceInteraction() boolean filterLastUsed = mSupportsAlwaysUseOption && !isVoiceInteraction()
&& !shouldShowTabs(); && !shouldShowTabs();
mWorkProfileUserHandle = fetchWorkProfileUserProfile();
mMultiProfilePagerAdapter = createMultiProfilePagerAdapter(initialIntents, rList, filterLastUsed); mMultiProfilePagerAdapter = createMultiProfilePagerAdapter(initialIntents, rList, filterLastUsed);
if (configureContentView()) { if (configureContentView()) {
return; return;