merge from open-source master

Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9
2010-07-14 16:11:13 -07:00
parent 975ecddc9e 4696f2fbcb
commit 50576fa815
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1704,8 +1704,9 @@ class ContextImpl extends Context {
            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;
        }