Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Also check inactive profile targets in onHandlePackagesChanged" into rvc-dev am: 3258a3e170 am: 0c11f15f7e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894163

Change-Id: I02236ba48322a6e0f4118b6c334edeb208474f47
This commit is contained in:
Antoan Angelov
2020-06-18 14:40:11 +00:00
committed by Automerger Merge Worker
parent cb4f9ddacc 0c11f15f7e
commit 577eccf8f9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -1938,7 +1938,7 @@ public class ResolverActivity extends Activity implements
ResolverListAdapter activeListAdapter = ResolverListAdapter activeListAdapter =
mMultiProfilePagerAdapter.getActiveListAdapter(); mMultiProfilePagerAdapter.getActiveListAdapter();
activeListAdapter.notifyDataSetChanged(); activeListAdapter.notifyDataSetChanged();
if (activeListAdapter.getCount() == 0) { if (activeListAdapter.getCount() == 0 && !inactiveListAdapterHasItems()) {
// We no longer have any items... just finish the activity. // We no longer have any items... just finish the activity.
finish(); 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() { private BroadcastReceiver createWorkProfileStateReceiver() {
return new BroadcastReceiver() { return new BroadcastReceiver() {
@Override @Override