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

Commit 61b38718 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 0de06b7e: Merge into jb-mr1-dev

* commit '0de06b7e':
  TaskStackBuilder and intents without an explicit target
parents ad1712ff 0de06b7e
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;