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

Commit f61367fb 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: 71e84985

Change-Id: Ia811abf880ae45438f850c84e3bc21ad5f3f46ea
parents a8b31d17 71e84985

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