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

Commit 5ae2afdc authored by bulic's avatar bulic Committed by Android (Google) Code Review
Browse files

Merge "Prevent home task from being set as ontopofhome"

parents f9cb86ae ccd23071

services/core/java/com/android/server/am/ActivityStack.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1421,7 +1421,8 @@ final class ActivityStack { 




        final TaskRecord nextTask = next.task;

        final TaskRecord nextTask = next.task;

        final TaskRecord prevTask = prev != null ? prev.task : null;

        final TaskRecord prevTask = prev != null ? prev.task : null;

        if (prevTask != null && prevTask.mOnTopOfHome && prev.finishing && prev.frontOfTask) {

        if (prevTask != null && prevTask.stack == this &&

                prevTask.mOnTopOfHome && prev.finishing && prev.frontOfTask) {

            if (DEBUG_STACK)  mStackSupervisor.validateTopActivitiesLocked();

            if (DEBUG_STACK)  mStackSupervisor.validateTopActivitiesLocked();

            if (prevTask == nextTask) {

            if (prevTask == nextTask) {

                prevTask.setFrontOfTask();

                prevTask.setFrontOfTask();