Merge "Fix NPE in sharesheet on devices without Work Profile." into rvc-dev (58bb12f7) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -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();
		if (mChooserMultiProfilePagerAdapter.getCount() > 1) {
		mChooserMultiProfilePagerAdapter.getInactiveListAdapter().handlePackagesChanged();
		}
		} else {
		listAdapter.handlePackagesChanged();
		}