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

Change-Id: I0b48e568be9adf07ee6c9e12661c351d260a63dc
2020-04-21 11:06:48 +00:00
parent d03f62551f efb5561878
commit b68d36e533
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();
    }