Cancel show runnable when bouncer is hidden
Otherwise the bouncer might report "showing soon" and future
show() calls will be aborted.
Test: swipe up and down, wait for face, swipe up
Test: tap on notification on bouncer
Test: swipe up, unlock from bouncer
Test: unlock on lock screen, swipe up to dismiss bouncer
Fixes: 132846921
Change-Id: I22a1af2ef903b266ae8d8fcb9eb55f6cc11aeae2
(cherry picked from commit 9b8e5e3875f1cb1081814f2ac94ac4ce0c02b24d)
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index 40085a4..c4d346c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -207,14 +207,12 @@
* @see #onFullyShown()
*/
private void onFullyHidden() {
- if (!mShowingSoon) {
- cancelShowRunnable();
- if (mRoot != null) {
- mRoot.setVisibility(View.INVISIBLE);
- }
- mFalsingManager.onBouncerHidden();
- DejankUtils.postAfterTraversal(mResetRunnable);
+ cancelShowRunnable();
+ if (mRoot != null) {
+ mRoot.setVisibility(View.INVISIBLE);
}
+ mFalsingManager.onBouncerHidden();
+ DejankUtils.postAfterTraversal(mResetRunnable);
}
private final Runnable mShowRunnable = new Runnable() {