Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev

Browse Source 
* commit '20ec9b79f1d98ccbe5b8d4486feaf37a4f80a945':
  Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
This commit is contained in:
Nicolas Prevot
2014-10-14 17:51:02 +00:00
committed by Android Git Automerger
parent 584b564df0 20ec9b79f1
commit e5a75d1333
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/ResolverActivity.java
View File

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