diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-14 16:14:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-14 16:14:06 -0700 |
| commit | a51eb0bb2fd9505a943a62f5f6b501fcb23b72bd (patch) | |
| tree | ccee1f309ad02cd4eda1ec79d488c4d25891aed4 /core/java | |
| parent | 738afc5c1b89f4bfdb4076c753b7db3a8432135f (diff) | |
| parent | 50576fa8152557a25e1a231c66d694fffbab34d6 (diff) | |
| download | frameworks_base-a51eb0bb2fd9505a943a62f5f6b501fcb23b72bd.zip frameworks_base-a51eb0bb2fd9505a943a62f5f6b501fcb23b72bd.tar.gz frameworks_base-a51eb0bb2fd9505a943a62f5f6b501fcb23b72bd.tar.bz2 | |
am 50576fa8: merge from open-source master
Merge commit '50576fa8152557a25e1a231c66d694fffbab34d6'
* commit '50576fa8152557a25e1a231c66d694fffbab34d6':
Start app with several activities with intent filter [Main, Launcher] was broken
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 6e9586c..a2a74f8 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1715,8 +1715,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; } |