diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:29:16 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:29:18 -0700 |
| commit | 0de06b7e19e4c6329cc966198d249d12c2b19d40 (patch) | |
| tree | c962930e25f84eb27ea9b45f7020f689177da7a8 /core/java | |
| parent | c68accd35e9ee0a49172ef144664f0fe9187ccd7 (diff) | |
| parent | 9ceac5a02f08bc350d6047660ed75019313f4703 (diff) | |
| download | frameworks_base-0de06b7e19e4c6329cc966198d249d12c2b19d40.zip frameworks_base-0de06b7e19e4c6329cc966198d249d12c2b19d40.tar.gz frameworks_base-0de06b7e19e4c6329cc966198d249d12c2b19d40.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/TaskStackBuilder.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java index cadf5e4..83f7abf 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; |