Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c8267ec authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am ff997bc9: Merge "TaskStackBuilder and intents without an explicit target" into jb-mr1-dev

* commit 'ff997bc9':
  TaskStackBuilder and intents without an explicit target
parents 270d08d6 ff997bc9
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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;