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

Commit 14ae5d77 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: I1af87856b06a8996361732c932f5067921f72c13
parents f0caffa0 58bb12f7

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -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();

        }

        }