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

Commit 31937d2f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow activity to be reparent while allowTaskReparenting is applied"... 

Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19968964



Change-Id: Ifca1b7ff8def76783084d0347b37332ac6a82913
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0b0641c9 7ef756cc

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

+2 −1
Original line number Diff line number Diff line
@@ -141,15 +141,16 @@ class ResetTargetTaskHelper implements Consumer<Task>, Predicate<ActivityRecord> 
            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