diff options
| author | 2022-12-12 15:08:08 +0000 | |
|---|---|---|
| committer | 2022-12-12 15:08:08 +0000 | |
| commit | c860b3112f92a6e176e65b11f4c7004dc16a300e (patch) | |
| tree | a97adb4facc900d1a3d1d93f5425d9deb5ebae08 | |
| parent | a80b3b3ac1d19b753009e7bd2065cdc7d4d0e620 (diff) | |
| parent | eedcc997169f4af38627fb93c8608a35e7ec6198 (diff) | |
Merge "Check lock-task mode if task_on_home is applied" into tm-qpr-dev am: 2016b1dcd1 am: eedcc99716
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20673616
Change-Id: I350129fc898537a3e0a0aeec3a49a673ca2e9b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 0be419188122..03e3e936c179 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -1125,11 +1125,12 @@ class Task extends TaskFragment { if (inMultiWindowMode() || !hasChild()) return false; if (intent != null) { 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 boolean isLockTaskModeViolation = task != null - && mAtmService.getLockTaskController().isLockTaskModeViolation(task); - return (intent.getFlags() & returnHomeFlags) == returnHomeFlags - && !isLockTaskModeViolation; + return !(task != null + && mAtmService.getLockTaskController().isLockTaskModeViolation(task)); } final Task bottomTask = getBottomMostTask(); return bottomTask != this && bottomTask.returnsToHomeRootTask(); |