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

Commit 1cee73cc authored by Himanshu Gupta's avatar Himanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Fixing the population of ResolveInfo.userHandle in initial intents."

parents c614b47a bbdd6337

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)));

                }