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

Commit 7aa54698 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Call updateChooserCounts with the correct user id" into rvc-dev am:... 

Merge "Call updateChooserCounts with the correct user id" into rvc-dev am: dbbb59a1 am: 7d14d57b am: 357031d6 am: 1975717b

Change-Id: Ia99fccc02eff585bf194d7b077191a16ae15bcfb
parents 85ccb14f 1975717b

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

+1 −1
Original line number Diff line number Diff line
@@ -2171,7 +2171,7 @@ public class ChooserActivity extends ResolverActivity implements 
                        mChooserMultiProfilePagerAdapter.getActiveListAdapter();

                if (currentListAdapter != null) {

                    currentListAdapter.updateModel(info.getResolvedComponentName());

                    currentListAdapter.updateChooserCounts(ri.activityInfo.packageName, getUserId(),

                    currentListAdapter.updateChooserCounts(ri.activityInfo.packageName,

                            targetIntent.getAction());

                }

                if (DEBUG) {

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

+3 −2
Original line number Diff line number Diff line
@@ -165,8 +165,9 @@ public class ResolverListAdapter extends BaseAdapter { 
        mResolverListController.updateModel(componentName);

    }



    public void updateChooserCounts(String packageName, int userId, String action) {

        mResolverListController.updateChooserCounts(packageName, userId, action);

    public void updateChooserCounts(String packageName, String action) {

        mResolverListController.updateChooserCounts(

                packageName, getUserHandle().getIdentifier(), action);

    }



    List<ResolvedComponentInfo> getUnfilteredResolveList() {