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

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

Browse Source 
Change-Id: I54f849fe65cbcb758526eefa78594524f1da6907
This commit is contained in:
TreeHugger Robot
2020-04-16 17:53:19 +00:00
committed by Automerger Merge Worker
parent acdb4a7a18 dbbb59a1c5
commit 7d14d57b2d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ChooserActivity.java
View File

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

5
core/java/com/android/internal/app/ResolverListAdapter.java
View File

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