From adc9ba1add87d1b0664a2d2f53605c311b9a637d Mon Sep 17 00:00:00 2001 From: Himanshu Gupta Date: Thu, 26 Jan 2023 20:00:52 +0000 Subject: [PATCH] Fixes for sharesheet adaptors giving IndexOutOfBoundsException Bug: 266175872 Test: atest ResolverActivityTest Change-Id: Ic07e6078abf3b0bb82700b91a6987e05d0d4228f --- .../android/internal/app/ChooserMultiProfilePagerAdapter.java | 3 +++ .../android/internal/app/ResolverMultiProfilePagerAdapter.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java index f56f8184a86b5..7beb059fb6484 100644 --- a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java @@ -163,6 +163,9 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd @Override @Nullable public ChooserListAdapter getWorkListAdapter() { + if (getCount() == 1) { + return null; + } return getAdapterForIndex(PROFILE_WORK).getListAdapter(); } diff --git a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java index 1ecaf21a5148a..7677912636739 100644 --- a/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/ResolverMultiProfilePagerAdapter.java @@ -142,6 +142,9 @@ public class ResolverMultiProfilePagerAdapter extends AbstractMultiProfilePagerA @Override @Nullable public ResolverListAdapter getWorkListAdapter() { + if (getCount() == 1) { + return null; + } return getAdapterForIndex(PROFILE_WORK); }