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

Commit d73abe2b authored by Louis Chang's avatar Louis Chang
Browse files

Determine if the activity is the topmost one 

ActivityStack#mTopActivityOccludesKeyguard may be
incorrectly updated by a non-top activity.

Bug: 149837574
Test: start emergency dialer from lockscreen
Change-Id: I830e572f008cbebb95f0d76416c70d948063dd97
parent 0f829652

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

+2 −1
Original line number Diff line number Diff line
@@ -7355,7 +7355,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) {