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

Commit d8a21bbe authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev

parents 93eed0c0 1a815921

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

+5 −0
Original line number Diff line number Diff line
@@ -819,6 +819,11 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic 
                        }

                        ResolveInfo ri = new ResolveInfo();

                        ri.activityInfo = ai;

                        UserManager userManager =

                                (UserManager) getSystemService(Context.USER_SERVICE);

                        if (userManager.isManagedProfile()) {

                            ri.noResourceId = true;

                        }

                        if (ii instanceof LabeledIntent) {

                            LabeledIntent li = (LabeledIntent)ii;

                            ri.resolvePackageName = li.getSourcePackage();