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

Commit 40b5a52b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev 

* changes:
  [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d
  [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied
parents e6d0a468 c30420a5

services/core/java/com/android/server/wm/ResetTargetTaskHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -146,15 +146,16 @@ class ResetTargetTaskHelper { 
            return false;



        } else {

            mResultActivities.add(r);

            if (r.resultTo != null) {

                // If this activity is sending a reply to a previous activity, we can't do

                // anything with it now until we reach the start of the reply chain.

                // NOTE: that we are assuming the result is always to the previous activity,

                // which is almost always the case but we really shouldn't count on.

                mResultActivities.add(r);

                return false;

            } else if (mTargetTaskFound && allowTaskReparenting && mTargetTask.affinity != null

                    && mTargetTask.affinity.equals(r.taskAffinity)) {

                mResultActivities.add(r);

                // This activity has an affinity for our task. Either remove it if we are

                // clearing or move it over to our task. Note that we currently punt on the case

                // where we are resetting a task that is not at the top but who has activities