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

Commit 4563bf5b authored by Evan Rosky's avatar Evan Rosky
Browse files

Fix incomplete merge 

Bug: 166736358
Test: can actually unlock phone when it boots with new transitions
Change-Id: I85e7449b05d09e70b5debf4ee2b3f3b01488e7bc
parent 961f7375

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

+2 −3
Original line number Diff line number Diff line
@@ -206,9 +206,8 @@ class KeyguardController { 
                    mAodShowing ? 1 : 0,

                    1 /* keyguardGoingAway */,

                    "keyguardGoingAway");

            mRootWindowContainer.getDefaultDisplay()

                    .prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY,

                            convertTransitFlags(flags));

            mRootWindowContainer.getDefaultDisplay().requestTransitionAndLegacyPrepare(

                    TRANSIT_KEYGUARD_GOING_AWAY, convertTransitFlags(flags));

            updateKeyguardSleepToken();



            // Some stack visibility might change (e.g. docked stack)