Merge "Cancel show runnable when bouncer is hidden" into qt-r1-dev

am: 859adc665b

Change-Id: I9ff8a40351e537ea48cc53c532207d25d2a169fc
This commit is contained in:
Lucas Dupin
2019-07-25 11:34:49 -07:00
committed by android-build-merger

View File

@@ -207,14 +207,12 @@ public class KeyguardBouncer {
* @see #onFullyShown() * @see #onFullyShown()
*/ */
private void onFullyHidden() { private void onFullyHidden() {
if (!mShowingSoon) { cancelShowRunnable();
cancelShowRunnable(); if (mRoot != null) {
if (mRoot != null) { mRoot.setVisibility(View.INVISIBLE);
mRoot.setVisibility(View.INVISIBLE);
}
mFalsingManager.onBouncerHidden();
DejankUtils.postAfterTraversal(mResetRunnable);
} }
mFalsingManager.onBouncerHidden();
DejankUtils.postAfterTraversal(mResetRunnable);
} }
private final Runnable mShowRunnable = new Runnable() { private final Runnable mShowRunnable = new Runnable() {