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

Change-Id: Ibdea947ad8cd3b3a8974334f69f2e21e35afb785
2020-04-21 11:22:47 +00:00
parent a04940a909 b68d36e533
commit aa17a1b193
1 changed files with 1 additions and 1 deletions
--- 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();
    }