diff options
| author | 2020-04-20 11:50:36 +0800 | |
|---|---|---|
| committer | 2020-04-20 12:56:30 +0000 | |
| commit | 44dc860d887486eab6a62a9a019a988bd94ca4aa (patch) | |
| tree | 547a5e54214674e33b7c59e2dea7477c0363cf18 | |
| parent | d4fdca6e39c446e047513b3dff0eb4d69b77b19b (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index e76eda06d2d3..2648c86d3c6a 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(); } |