From 44dc860d887486eab6a62a9a019a988bd94ca4aa Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Mon, 20 Apr 2020 11:50:36 +0800 Subject: [PATCH] Check task visibility vs. root task visibility An activity was evaluated as should-be-resumed while it shouldn't, because the root task was always visible in split-screen mode. Check if the activity's task visibility instead. Bug: 153108952 Test: atest SplitScreenTests Change-Id: Ifa1f7b32817269d16138bbfbc7e0dc7f79c8a14a --- services/core/java/com/android/server/wm/ActivityRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index e76eda06d2d3c..2648c86d3c6a6 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -4712,7 +4712,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A */ private boolean shouldBeResumed(ActivityRecord activeActivity) { return shouldMakeActive(activeActivity) && isFocusable() - && getRootTask().getVisibility(activeActivity) == STACK_VISIBILITY_VISIBLE + && getTask().getVisibility(activeActivity) == STACK_VISIBILITY_VISIBLE && canResumeByCompat(); }