From f6a1f1783e3b8559f13e24417da021fea24bf412 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 18 Apr 2019 20:57:40 -0700 Subject: [PATCH] Dismiss keyguard if pulsing unlocked BouncerExpansionCallback#onFullyShown will never be called when unlocked because we collapse the shade without showing the PIN pad. We need some special logic to make sure that the device will wake-up. Test: swipe up from pulse when locked Test: swipe up from pulse when unlocked Fixes: 129315800 Change-Id: I740e598b180ad7aeb5b023a5984942b89ae1df5f --- .../statusbar/phone/StatusBarKeyguardViewManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 09fa9ca6d0cf4..326144e60b2d2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -241,6 +241,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb && !mBouncer.isShowing() && !mBouncer.isAnimatingAway()) { mBouncer.show(false /* resetSecuritySelection */, false /* scrimmed */); } + } else if (mPulsing && expansion == KeyguardBouncer.EXPANSION_VISIBLE) { + // Panel expanded while pulsing but didn't translate the bouncer (because we are + // unlocked.) Let's simply wake-up to dismiss the lock screen. + mStatusBar.wakeUpIfDozing(SystemClock.uptimeMillis(), mContainer, "BOUNCER_VISIBLE"); } }