Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe384dbf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11971848

Change-Id: I887d6105f42973128c1d1fb5c89c746d41e997d6
parents 7abe3c25 58bb12f7

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();

        }