commit d8a21bbedbaeb752b7f458823ed709b9a01c14c1
author Nicolas Prevot <nprevot@google.com> Tue Oct 14 09:07:41 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 14 09:07:43 2014 +0000
tree 0e7cad72fb0b79626d7fb557dee18f6462acb395
parent 93eed0c03a1f9cd66946760045122516483ba3f0
parent 1a815921694ca2b3ad4dbb85bf82d85e831bc84e

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

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

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index aa55d23..c8d8099 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -819,6 +819,11 @@
                         }
                         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();