Merge "Start app with several activities with intent filter [Main, Launcher] was broken"

Author: Jean-Baptiste Queru

core/java/android/app/ContextImpl.java

@@ -1687,8 +1687,9 @@ public Intent getLaunchIntentForPackage(String packageName) {
             if (resolveInfo == null) {
                 return null;
             }
-            Intent intent = new Intent(Intent.ACTION_MAIN);
-            intent.setClassName(packageName, resolveInfo.activityInfo.name);
+            Intent intent = new Intent(intentToResolve);
+            intent.setClassName(resolveInfo.activityInfo.applicationInfo.packageName,
+                                resolveInfo.activityInfo.name);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             return intent;
         }