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

Commit 036fce18 authored by Louis Chang's avatar Louis Chang
Browse files

Do not add the noDisplay activity to source task 

Force adding the noDisplay activity to the source task may not
comply with the task affinity policy. It is also possible that the
activities in the source task being removed due to the
FLAG_ACTIVITY_CLEAR_TASK flag.

Bug: 359130793
Test: wm presubmit
Flag: EXEMPT bugfix
Change-Id: I7e3da64f69c63b625596f332ca8b3136178c26ab
parent baed9067

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

+1 −4
Original line number Diff line number Diff line
@@ -2759,10 +2759,7 @@ class ActivityStarter { 
            mInTask = null;

            // Launch ResolverActivity in the source task, so that it stays in the task bounds

            // when in freeform workspace.

            // Also put noDisplay activities in the source task. These by itself can be placed

            // in any task/root-task, however it could launch other activities like

            // ResolverActivity, and we want those to stay in the original task.

            if ((mStartActivity.isResolverOrDelegateActivity() || mStartActivity.noDisplay)

            if (mStartActivity.isResolverOrDelegateActivity()

                    && mSourceRecord != null && mSourceRecord.inFreeformWindowingMode()) {

                mAddingToTask = true;

            }