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

Commit 8ccad76f authored by Matt Pietal's avatar Matt Pietal
Browse files

Enable some logs around pendingLock 

Bug: 407098346
Test: manual - a cross process race condtion occurs with WM
Flag: EXEMPT bugfix
Change-Id: I1c2dee6847e4b874bd018eb875321bed463979cd
parent deecd8f6

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

+2 −0
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ public class KeyguardService extends Service { 
                    SurfaceControl.Transaction candidateT, IBinder currentTransition,

                    IRemoteTransitionFinishedCallback candidateFinishCallback) {

                if ((candidateInfo.getFlags() & TRANSIT_FLAG_KEYGUARD_APPEARING) != 0) {

                    Log.i(TAG, "Transition merged with keyguard appearing, setPendingLock(true) "

                            + " and call cancelKeyguardExitAnimation()");

                    keyguardViewMediator.setPendingLock(true);

                    keyguardViewMediator.cancelKeyguardExitAnimation();

                    return;

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

+7 −11
Original line number Diff line number Diff line
@@ -1957,12 +1957,10 @@ public class KeyguardViewMediator implements CoreStartable, 
            //   - The screen off animation is cancelled by the device waking back up. We will call

            //     maybeHandlePendingLock from KeyguardViewMediator#onStartedWakingUp.

            if (mScreenOffAnimationController.shouldDelayKeyguardShow()) {

                if (DEBUG) {

                Log.d(TAG, "#maybeHandlePendingLock: not handling because the screen off "

                        + "animation's shouldDelayKeyguardShow() returned true. This should be "

                        + "handled soon by #onStartedWakingUp, or by the end actions of the "

                        + "screen off animation.");

                }



                return;

            }
@@ -1973,11 +1971,9 @@ public class KeyguardViewMediator implements CoreStartable, 
            // StatusBar#finishKeyguardFadingAway, which is always responsible for setting

            // isKeyguardGoingAway to false.

            if (mKeyguardStateController.isKeyguardGoingAway()) {

                if (DEBUG) {

                Log.d(TAG, "#maybeHandlePendingLock: not handling because the keyguard is "

                        + "going away. This should be handled shortly by "

                        + "StatusBar#finishKeyguardFadingAway.");

                }



                return;

            }