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

Commit dd1a44f3 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: dbbb59a1 

Change-Id: Id598ac00dba853485691108c77ef8f99137ea04f
parents 492edf7b dbbb59a1

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

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

                        mChooserMultiProfilePagerAdapter.getActiveListAdapter();

                if (currentListAdapter != null) {

                if (currentListAdapter != null) {

                    currentListAdapter.updateModel(info.getResolvedComponentName());

                    currentListAdapter.updateModel(info.getResolvedComponentName());

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

                    currentListAdapter.updateChooserCounts(ri.activityInfo.packageName,

                            targetIntent.getAction());

                            targetIntent.getAction());

                }

                }

                if (DEBUG) {

                if (DEBUG) {

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

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

        mResolverListController.updateModel(componentName);

    }

    }





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

    public void updateChooserCounts(String packageName, String action) {

        mResolverListController.updateChooserCounts(packageName, userId, action);

        mResolverListController.updateChooserCounts(

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

    }

    }





    List<ResolvedComponentInfo> getUnfilteredResolveList() {

    List<ResolvedComponentInfo> getUnfilteredResolveList() {