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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-23 21:25:24 +00:00
committed by Android (Google) Code Review
parent 11affeca99 c391362e95
commit 58bb12f7f8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -1017,14 +1017,17 @@ public class ChooserActivity extends ResolverActivity implements
/** /**
* Update UI to reflect changes in data. * 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) { private void handlePackagesChanged(@Nullable ResolverListAdapter listAdapter) {
// Refresh pinned items // Refresh pinned items
mPinnedSharedPrefs = getPinnedSharedPrefs(this); mPinnedSharedPrefs = getPinnedSharedPrefs(this);
if (listAdapter == null) { if (listAdapter == null) {
mChooserMultiProfilePagerAdapter.getActiveListAdapter().handlePackagesChanged(); mChooserMultiProfilePagerAdapter.getActiveListAdapter().handlePackagesChanged();
if (mChooserMultiProfilePagerAdapter.getCount() > 1) {
mChooserMultiProfilePagerAdapter.getInactiveListAdapter().handlePackagesChanged(); mChooserMultiProfilePagerAdapter.getInactiveListAdapter().handlePackagesChanged();
}
} else { } else {
listAdapter.handlePackagesChanged(); listAdapter.handlePackagesChanged();
} }