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

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

Merge "Consider the lock-task mode while using FLAG_ACTIVITY_TASK_ON_HOME" into sc-v2-dev

parents e8e382c0 d41841f4

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

+5 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,11 @@ class Task extends TaskFragment { 
        if (inMultiWindowMode() || !hasChild()) return false;

        if (intent != null) {

            final int returnHomeFlags = FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME;

            return intent != null && (intent.getFlags() & returnHomeFlags) == returnHomeFlags;

            final Task task = getDisplayArea() != null ? getDisplayArea().getRootHomeTask() : null;

            final boolean isLockTaskModeViolation = task != null

                    && mAtmService.getLockTaskController().isLockTaskModeViolation(task);

            return (intent.getFlags() & returnHomeFlags) == returnHomeFlags

                    && !isLockTaskModeViolation;

        }

        final Task bottomTask = getBottomMostTask();

        return bottomTask != this && bottomTask.returnsToHomeRootTask();