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

Commit f86aaab3 authored by Matt Pietal's avatar Matt Pietal
Browse files

Support direct calls to go away 

This can happen in the case of activities requesting dismissal
over an unlocked lockscreen. Detect this case and allow the
exit animation to proceed.

Fixes: 436308551
Test: atest KeyguardViewMediatorTest
Flag: EXEMPT bugfix
Change-Id: I9b8fa6a8f6b227779d2f539b6c918b4133bbb52f
parent a043ee83

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

+6 −0
Original line number Diff line number Diff line
@@ -3374,6 +3374,12 @@ public class KeyguardViewMediator implements CoreStartable, 
        Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime

                + " fadeoutDuration=" + fadeoutDuration);

        int currentUserId = mSelectedUserInteractor.getSelectedUserId();



        // Requests to exit directly from WM are valid if the lockscreen can be dismissed

        if (mKeyguardStateController.canDismissLockScreen()) {

            mLastHideRequest = mLastShowRequest;

        }



        String error = null;

        if (mGoingAwayRequestedForUserId != currentUserId) {

            error = "Not executing handleStartKeyguardExitAnimationInner() due to userId "