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

Fixing the population of ResolveInfo.userHandle in initial intents.

Browse Source 
Bug: 266918493, 267583683
Test: atest ResolverActivityTest, ChooserActivityTest
Change-Id: I7416443ed331318bd542a1d33313abd793e5032d
This commit is contained in:
Himanshu Gupta
2023-02-02 16:48:09 +00:00
parent ffbf715813
commit bbdd6337e1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,12 +202,12 @@ public class ChooserListAdapter extends ResolverListAdapter {
ri.nonLocalizedLabel = li.getNonLocalizedLabel();
ri.icon = li.getIconResource();
ri.iconResourceId = ri.icon;
ri.userHandle = mInitialIntentsUserSpace;
}
if (userManager.isManagedProfile()) {
ri.noResourceId = true;
ri.icon = 0;
}
ri.userHandle = mInitialIntentsUserSpace;
mCallerTargets.add(new DisplayResolveInfo(ii, ri, ii, makePresentationGetter(ri)));
if (mCallerTargets.size() == MAX_SUGGESTED_APP_TARGETS) break;
}

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

@@ -447,13 +447,13 @@ public class ResolverListAdapter extends BaseAdapter {
ri.nonLocalizedLabel = li.getNonLocalizedLabel();
ri.icon = li.getIconResource();
ri.iconResourceId = ri.icon;
ri.userHandle = mInitialIntentsUserSpace;
}
if (userManager.isManagedProfile()) {
ri.noResourceId = true;
ri.icon = 0;
}
ri.userHandle = mInitialIntentsUserSpace;
addResolveInfo(new DisplayResolveInfo(ii, ri,
ri.loadLabel(mPm), null, ii, makePresentationGetter(ri)));
}