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

Commit d028bf2b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Fix NPE in sharesheet on devices without Work Profile." into rvc-dev am: 58bb12f7 am: 14ae5d77 am: 57962cd1" into rvc-qpr-dev-plus-aosp am: f3333136

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

Change-Id: I7842f94bd3a7a2755bcd859c88a376e959a6ffc7
parents 4f5a256c f3333136

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

        }