Merge into jb-mr1-dev

Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
2012-09-25 09:29:16 -07:00
parent c68accd35e 9ceac5a02f
commit 0de06b7e19
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/app/TaskStackBuilder.java
+++ b/core/java/android/app/TaskStackBuilder.java
@@ -128,7 +128,11 @@ public class TaskStackBuilder {
        if (parent != null) {
            // We have the actual parent intent, build the rest from static metadata
            // then add the direct parent intent to the end.
-            addParentStack(parent.getComponent());
+            ComponentName target = parent.getComponent();
+            if (target == null) {
+                target = parent.resolveActivity(mSourceContext.getPackageManager());
+            }
+            addParentStack(target);
            addNextIntent(parent);
        }
        return this;