diff options
| author | 2023-02-02 16:48:09 +0000 | |
|---|---|---|
| committer | 2023-02-02 17:17:35 +0000 | |
| commit | bbdd6337e1c516d1343cf438332b27f71c446974 (patch) | |
| tree | 2241237ec12fc845c7225ad90bd90d75213df10b | |
| parent | ffbf7158134e8fdda35c5d030792ae0c910fc59a (diff) | |
Fixing the population of ResolveInfo.userHandle in initial intents.
Bug: 266918493, 267583683
Test: atest ResolverActivityTest, ChooserActivityTest
Change-Id: I7416443ed331318bd542a1d33313abd793e5032d
| -rw-r--r-- | core/java/com/android/internal/app/ChooserListAdapter.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/app/ResolverListAdapter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ChooserListAdapter.java b/core/java/com/android/internal/app/ChooserListAdapter.java index 681bc7a0a03f..1eecb413adcb 100644 --- a/core/java/com/android/internal/app/ChooserListAdapter.java +++ b/core/java/com/android/internal/app/ChooserListAdapter.java @@ -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; } diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java index 0ea60a7ddbfe..18c8eb4ec46b 100644 --- a/core/java/com/android/internal/app/ResolverListAdapter.java +++ b/core/java/com/android/internal/app/ResolverListAdapter.java @@ -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))); } |