From c2d8c7f7a9fad0151e67b467f64b54b4b13d9c9d Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Mon, 25 Mar 2024 14:40:05 +0000 Subject: Apply ag/26029901 to V2 Avoid NPE when checking if an adapter is empty. Bug: 328172905 Test: atest IntentResolver-tests-activity Change-Id: Id5f46cb876cf27c526f601bc8890d59533a1788f --- java/src/com/android/intentresolver/v2/ChooserActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'java/src/com') diff --git a/java/src/com/android/intentresolver/v2/ChooserActivity.java b/java/src/com/android/intentresolver/v2/ChooserActivity.java index cb97d94f..ffa0469c 100644 --- a/java/src/com/android/intentresolver/v2/ChooserActivity.java +++ b/java/src/com/android/intentresolver/v2/ChooserActivity.java @@ -2448,8 +2448,9 @@ public class ChooserActivity extends Hilt_ChooserActivity implements if (!shouldShowContentPreview()) { return false; } - boolean isEmpty = mChooserMultiProfilePagerAdapter.getListAdapterForUserHandle( - UserHandle.of(UserHandle.myUserId())).getCount() == 0; + ResolverListAdapter adapter = mChooserMultiProfilePagerAdapter.getListAdapterForUserHandle( + UserHandle.of(UserHandle.myUserId())); + boolean isEmpty = adapter == null || adapter.getCount() == 0; return (mFeatureFlags.scrollablePreview() || mProfiles.getWorkProfilePresent()) && (!isEmpty || shouldShowContentPreviewWhenEmpty()); } -- cgit v1.2.3-59-g8ed1b