Merge "Check task visibility vs. root task visibility" into rvc-dev am: ae6d49183e

Change-Id: If427e92f5c27cb4f229f49da721a3a9320183b7f
This commit is contained in:
TreeHugger Robot
2020-04-21 10:59:37 +00:00
committed by Automerger Merge Worker

View File

@@ -4712,7 +4712,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
*/ */
private boolean shouldBeResumed(ActivityRecord activeActivity) { private boolean shouldBeResumed(ActivityRecord activeActivity) {
return shouldMakeActive(activeActivity) && isFocusable() return shouldMakeActive(activeActivity) && isFocusable()
&& getRootTask().getVisibility(activeActivity) == STACK_VISIBILITY_VISIBLE && getTask().getVisibility(activeActivity) == STACK_VISIBILITY_VISIBLE
&& canResumeByCompat(); && canResumeByCompat();
} }