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

Commit ff997bc9 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

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

parents dd6d7841 9ceac5a0

core/java/android/app/TaskStackBuilder.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -128,7 +128,11 @@ public class TaskStackBuilder { 
        if (parent != null) {

        if (parent != null) {

            // We have the actual parent intent, build the rest from static metadata

            // We have the actual parent intent, build the rest from static metadata

            // then add the direct parent intent to the end.

            // 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);

            addNextIntent(parent);

        }

        }

        return this;

        return this;