Merge "Fix NPE in sharesheet on devices without Work Profile." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-06-23 21:25:24 +00:00
committed by Android (Google) Code Review

View File

@@ -1017,14 +1017,17 @@ public class ChooserActivity extends ResolverActivity implements
/**
* Update UI to reflect changes in data.
* <p>If {@code listAdapter} is {@code null}, both profile list adapters are updated.
* <p>If {@code listAdapter} is {@code null}, both profile list adapters are updated if
* available.
*/
private void handlePackagesChanged(@Nullable ResolverListAdapter listAdapter) {
// Refresh pinned items
mPinnedSharedPrefs = getPinnedSharedPrefs(this);
if (listAdapter == null) {
mChooserMultiProfilePagerAdapter.getActiveListAdapter().handlePackagesChanged();
mChooserMultiProfilePagerAdapter.getInactiveListAdapter().handlePackagesChanged();
if (mChooserMultiProfilePagerAdapter.getCount() > 1) {
mChooserMultiProfilePagerAdapter.getInactiveListAdapter().handlePackagesChanged();
}
} else {
listAdapter.handlePackagesChanged();
}