summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohan Erlandsson <johan.erlandsson@sonyericsson.com>2010-03-31 08:20:51 +0200
committerJean-Baptiste Queru <jbq@google.com>2010-07-13 14:48:46 -0700
commitdf4cfa3664e06132c2e2cc26cade06a881f5e529 (patch)
tree145aedf4105e5874559349eaec1112d21196c1a4 /core
parente74e7e2a088cc9077e4ee98e01a48bb52e9cfd50 (diff)
downloadframeworks_base-df4cfa3664e06132c2e2cc26cade06a881f5e529.zip
frameworks_base-df4cfa3664e06132c2e2cc26cade06a881f5e529.tar.gz
frameworks_base-df4cfa3664e06132c2e2cc26cade06a881f5e529.tar.bz2
Start app with several activities with intent filter [Main, Launcher] was broken
When an application have more than one activities with intent filter [Main, Launcher], then the intent with ResolverActivity wasn't created correct. Change-Id: I2617122e07c35284862d2e0643888966ec0f7221
Diffstat (limited to 'core')
-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 54e3919..725de1a 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1687,8 +1687,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;
}