summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-14 16:11:13 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-07-14 16:11:13 -0700
commit50576fa8152557a25e1a231c66d694fffbab34d6 (patch)
tree01be04c88319d845631faf29e01b1d8c21b7616b
parent975ecddc9e72b8217d36e653fb9deabb9fd5b859 (diff)
parent4696f2fbcb02a1178b3b5701fae9d9737231db0a (diff)
downloadframeworks_base-50576fa8152557a25e1a231c66d694fffbab34d6.zip
frameworks_base-50576fa8152557a25e1a231c66d694fffbab34d6.tar.gz
frameworks_base-50576fa8152557a25e1a231c66d694fffbab34d6.tar.bz2
merge from open-source master
Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9
-rw-r--r--core/java/android/app/ContextImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index dc779fd..9deaa31 100644
--- 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;
}