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

Commit bbdd6337 authored by Himanshu Gupta's avatar Himanshu Gupta
Browse files

Fixing the population of ResolveInfo.userHandle in initial intents. 

Bug: 266918493, 267583683
Test: atest ResolverActivityTest, ChooserActivityTest
Change-Id: I7416443ed331318bd542a1d33313abd793e5032d
parent ffbf7158

core/java/com/android/internal/app/ChooserListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

            }

core/java/com/android/internal/app/ResolverListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -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)));

                }