Merge "Cancel show runnable when bouncer is hidden" into qt-r1-dev am: 859adc665b

am: 570b2fe034 Change-Id: I32b86bf196dc1ecbf36efd11a1321d19f1854ff1
2019-07-25 11:50:08 -07:00
parent b7256439ce 570b2fe034
commit 7777d95b54
1 changed files with 5 additions and 7 deletions
--- 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 @@ public class KeyguardBouncer {
     * @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() {