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

Commit fb4bb309 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: Ia211070b68bd04b256384618db989abcaadefd02
parents 949ce312 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) {