diff options
| author | 2024-01-30 19:35:31 +0000 | |
|---|---|---|
| committer | 2024-01-30 19:35:31 +0000 | |
| commit | b2bb4464ee586cfb3d8da41bab7f2895dcbb6808 (patch) | |
| tree | c7f32cbdd014da69994e022695761e3f9e8b2d4a /java/src | |
| parent | f30cb97a784ba508a82863ef74ea0135355aad0c (diff) | |
| parent | 7b468b86871b26e164c9bf8163fe7ca810ddbe08 (diff) | |
Merge "ChooserAdapter: fix NPE for non-work profiles" into main
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index 37a9cdc2..820fa3b2 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -1652,8 +1652,9 @@ public class ChooserActivity extends Hilt_ChooserActivity implements if (!shouldShowContentPreview()) { return false; } - boolean isEmpty = mMultiProfilePagerAdapter.getListAdapterForUserHandle( - UserHandle.of(UserHandle.myUserId())).getCount() == 0; + ResolverListAdapter adapter = mMultiProfilePagerAdapter.getListAdapterForUserHandle( + UserHandle.of(UserHandle.myUserId())); + boolean isEmpty = adapter == null || adapter.getCount() == 0; return (mFeatureFlags.scrollablePreview() || shouldShowTabs()) && (!isEmpty || shouldShowContentPreviewWhenEmpty()); } |