Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b68d36e5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I0b48e568be9adf07ee6c9e12661c351d260a63dc
parents d03f6255 efb55618

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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();

    }

    }