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

Commit 7ca847a9 authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "Add log to detect if hideKeyguardImpl is called when KeyguardStatusView... 

Merge "Add log to detect if hideKeyguardImpl is called when KeyguardStatusView disappear" into udc-qpr-dev am: 4d41d656

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



Change-Id: I185e5046cc3468d177a5824e9fe1c8b750279e8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc57643e 4d41d656

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -2368,10 +2368,16 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            //  * When phone is unlocked: we still don't want to execute hiding of the keyguard

            //    as the animation could prepare 'fake AOD' interface (without actually

            //    transitioning to keyguard state) and this might reset the view states

            // Log for b/290627350

            Log.d(TAG, "!shouldBeKeyguard mStatusBarStateController.isKeyguardRequested() "

                    + mStatusBarStateController.isKeyguardRequested() + " keyguardForDozing "

                    + keyguardForDozing + " wakeAndUnlocking " + wakeAndUnlocking

                    + " isWakingAndOccluded " + isWakingAndOccluded);

            if (!mScreenOffAnimationController.isKeyguardHideDelayed()

                    // If we're animating occluded, there's an activity launching over the keyguard

                    // UI. Wait to hide it until after the animation concludes.

                    && !mKeyguardViewMediator.isOccludeAnimationPlaying()) {

                Log.d(TAG, "hideKeyguardImpl " + forceStateChange);

                return hideKeyguardImpl(forceStateChange);

            }

        }