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

Commit 0aa58c58 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Fix incomplete merge"

parents bce74484 4563bf5b

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)