Merge "Fix Notification panel flickers comes from ag/4008279" into pi-dev

2018-05-14 20:25:40 +00:00
parent 4fd9dc11d0 efebbc2f7a
commit 035e25bf90
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
@@ -266,7 +266,9 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback {
    }

    private void showBouncer() {
-        mStatusBarKeyguardViewManager.showBouncer(false);
+        if (calculateMode() == MODE_SHOW_BOUNCER) {
+            mStatusBarKeyguardViewManager.showBouncer(false);
+        }
        mStatusBarKeyguardViewManager.animateCollapsePanels(
                FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR);
        mPendingShowBouncer = false;