Merge into jb-mr1-dev

Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java
index cadf5e46d2ec..83f7abf7871f 100644
--- 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;