Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check lock-task mode if task_on_home is applied" into tm-qpr-dev

Browse Source
This commit is contained in:
Jeff Chang
2022-12-12 06:00:52 +00:00
committed by Android (Google) Code Review
parent e87c348fcd 9eef8ebc44
commit 2016b1dcd1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/Task.java
View File

@@ -1125,11 +1125,12 @@ class Task extends TaskFragment {
if (inMultiWindowMode() || !hasChild()) return false; if (inMultiWindowMode() || !hasChild()) return false;
if (intent != null) { if (intent != null) {
final int returnHomeFlags = FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME; final int returnHomeFlags = FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME;
if ((intent.getFlags() & returnHomeFlags) != returnHomeFlags) {
return false;
}
final Task task = getDisplayArea() != null ? getDisplayArea().getRootHomeTask() : null; final Task task = getDisplayArea() != null ? getDisplayArea().getRootHomeTask() : null;
final boolean isLockTaskModeViolation = task != null return !(task != null
&& mAtmService.getLockTaskController().isLockTaskModeViolation(task); && mAtmService.getLockTaskController().isLockTaskModeViolation(task));
return (intent.getFlags() & returnHomeFlags) == returnHomeFlags
&& !isLockTaskModeViolation;
} }
final Task bottomTask = getBottomMostTask(); final Task bottomTask = getBottomMostTask();
return bottomTask != this && bottomTask.returnsToHomeRootTask(); return bottomTask != this && bottomTask.returnsToHomeRootTask();