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

Commit f0893dd7 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:... 

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

Change-Id: Ieaa8e21759437144f7af8d7c6fa227062214ec6f
parents 0be1de4f f2cfb002

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) {