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

Commit 7ca65306 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Do not consider embedded task as task switch" into sc-v2-dev

parents 4de48937 ca765813

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1798,7 +1798,7 @@ class ActivityStarter { 
        mRootWindowContainer.startPowerModeLaunchIfNeeded(

        mRootWindowContainer.startPowerModeLaunchIfNeeded(

                false /* forceSend */, mStartActivity);

                false /* forceSend */, mStartActivity);





        final boolean isTaskSwitch = startedTask != prevTopTask;

        final boolean isTaskSwitch = startedTask != prevTopTask && !startedTask.isEmbedded();

        mTargetRootTask.startActivityLocked(mStartActivity,

        mTargetRootTask.startActivityLocked(mStartActivity,

                topRootTask != null ? topRootTask.getTopNonFinishingActivity() : null, newTask,

                topRootTask != null ? topRootTask.getTopNonFinishingActivity() : null, newTask,

                isTaskSwitch, mOptions, sourceRecord);

                isTaskSwitch, mOptions, sourceRecord);