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

Commit 581a3c58 authored by arangelov's avatar arangelov Committed by Antoan Angelov
Browse files

Also check inactive profile targets in onHandlePackagesChanged 

Before we would only check the active tab for available
targets and finish the activity if there are none.
However, with the work tab, there can be cases where
the active tab has no targets, but the inactive tab does.

Fixes: 159202588
Test: manual
Change-Id: Ie03ebd1b022362681df432ec29299df86dceb490
parent 58fd58de

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

+8 −1
Original line number Diff line number Diff line
@@ -1938,7 +1938,7 @@ public class ResolverActivity extends Activity implements 
                ResolverListAdapter activeListAdapter =

                        mMultiProfilePagerAdapter.getActiveListAdapter();

                activeListAdapter.notifyDataSetChanged();

                if (activeListAdapter.getCount() == 0) {

                if (activeListAdapter.getCount() == 0 && !inactiveListAdapterHasItems()) {

                    // We no longer have any items...  just finish the activity.

                    finish();

                }
@@ -1948,6 +1948,13 @@ public class ResolverActivity extends Activity implements 
        }

    }



    private boolean inactiveListAdapterHasItems() {

        if (!shouldShowTabs()) {

            return false;

        }

        return mMultiProfilePagerAdapter.getInactiveListAdapter().getCount() > 0;

    }



    private BroadcastReceiver createWorkProfileStateReceiver() {

        return new BroadcastReceiver() {

            @Override