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

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

Merge "Determine if the activity is the topmost one" into rvc-dev am: b4d5aef6 

Change-Id: Ib6e574a2706e44a32e1b8ea58a4a45750580e6b0
parents a8070f29 b4d5aef6

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

+2 −1
Original line number Diff line number Diff line
@@ -7368,7 +7368,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        final ActivityStack stack = getRootTask();

        return stack != null &&

                stack.checkKeyguardVisibility(this, true /* shouldBeVisible */, true /* isTop */);

                stack.checkKeyguardVisibility(this, true /* shouldBeVisible */,

                        stack.topRunningActivity() == this /* isTop */);

    }



    void setTurnScreenOn(boolean turnScreenOn) {