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

Commit e859fefc authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "After keyguard exit animation, finish before notifying" into udc-dev am: c6be7237 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22419118



Change-Id: If675b416d63810dbf5e5acda02be6ebf84a4ae0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b57b8027 c6be7237

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+2 −2
Original line number Diff line number Diff line
@@ -2856,14 +2856,14 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                        + " wasShowing=" + wasShowing);

            }



            mKeyguardUnlockAnimationControllerLazy.get()

                    .notifyFinishedKeyguardExitAnimation(cancelled);

            finishSurfaceBehindRemoteAnimation(cancelled);



            // Dispatch the callback on animation finishes.

            mUpdateMonitor.dispatchKeyguardDismissAnimationFinished();

        });



        mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation(

                cancelled);

    }



    /**