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

Commit dbbb59a1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9d411d7d 4872e68c

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() {