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

Commit e6f7cff6 authored by Yunfan Chen's avatar Yunfan Chen Committed by Android (Google) Code Review
Browse files

Merge "Query KeyguardStateController for the previous state" into main

parents 35ffece4 19f62fbd
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3681,7 +3681,8 @@ public class KeyguardViewMediator implements CoreStartable,

        // Block the panel from expanding, in case we were doing a swipe to dismiss gesture.
        mKeyguardViewControllerLazy.get().blockPanelExpansionFromCurrentTouch();
        final boolean wasShowing = mShowing;
        final boolean wasShowing = ENABLE_NEW_KEYGUARD_SHELL_TRANSITIONS
                ? mKeyguardStateController.isShowing() : mShowing;
        InteractionJankMonitor.getInstance().end(CUJ_LOCKSCREEN_UNLOCK_ANIMATION);

        // Post layout changes to the next frame, so we don't hang at the end of the animation.