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

Commit e00c7d22 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "ChooserActivity: fix NPE for non-work profiles" into main

parents 13f6627e e8913b59

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

+4 −4
Original line number Diff line number Diff line
@@ -2960,10 +2960,10 @@ public class ChooserActivity extends ResolverActivity implements 
    }



    private boolean shouldShowStickyContentPreviewNoOrientationCheck() {

        return shouldShowTabs()

                && (mMultiProfilePagerAdapter.getListAdapterForUserHandle(

                        UserHandle.of(UserHandle.myUserId())).getCount() > 0

                    || shouldShowStickyContentPreviewWhenEmpty())

        ResolverListAdapter adapter = mMultiProfilePagerAdapter.getListAdapterForUserHandle(

                UserHandle.of(UserHandle.myUserId()));

        boolean isEmpty = adapter == null || adapter.getCount() == 0;

        return shouldShowTabs() && (!isEmpty || shouldShowStickyContentPreviewWhenEmpty())

                && shouldShowContentPreview();

    }