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

Commit 28f9029f authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix issue where keyguard wouldn't be dismissed 

Keyguard wouldn't be dismissed when launching the emergency dialer
from lock screen or locked camera.

Test: Tap on 'emergency' from lock screen and camera.
Test: Unlock from lock screen and camera.
Change-Id: I5d2f0f5c6a982cf633bca19cbeb5065a9f68e355
Fixes: 64470717
parent ad75ef4c

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

+3 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            // Since we won't get a setOccluded call we have to reset the view manually such that

            // the bouncer goes away.

            if (mOccluded) {

                reset(false /* hideBouncerWhenShowing */);

                reset(true /* hideBouncerWhenShowing */);

            }

        }

    };
@@ -316,6 +316,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                return;

            }

        }

        boolean isOccluding = !mOccluded && occluded;

        mOccluded = occluded;

        if (mShowing) {

            mStatusBar.updateMediaMetaData(false, animate && !occluded);
@@ -326,7 +327,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        if (!mDozing) {

            // If Keyguard is reshown, don't hide the bouncer as it might just have been requested

            // by a FLAG_DISMISS_KEYGUARD_ACTIVITY.

            reset(false /* hideBouncerWhenShowing*/);

            reset(isOccluding /* hideBouncerWhenShowing*/);

        }

        if (animate && !occluded && mShowing) {

            mStatusBar.animateKeyguardUnoccluding();