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

Change-Id: If427e92f5c27cb4f229f49da721a3a9320183b7f
2020-04-21 10:59:37 +00:00
parent 171b1d5b15 ae6d49183e
commit efb5561878
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();
    }