summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author felkachang <felkachang@google.com> 2018-05-14 12:22:40 +0800
committer felkachang <felkachang@google.com> 2018-05-14 12:36:34 +0800
commitefebbc2f7a83128ae76b81a2cd6a92c82b974c17 (patch)
tree6869bdb8fb75a10c632aeb33dbcb2eced4aa14e2
parent6db14d01c23810a2a98a1d249b9d98480f89a073 (diff)
Fix Notification panel flickers comes from ag/4008279
The flickr is come from the quick setting panel appear. The root cause is ag/4008279. Because FingerprintUnlockController.showBouncer will be called after fingerprint authentication, to show the bouncer without considerating the mode is the problem. The solution is to use FingerprintUnlockController.calculateMode() to get whether the mode is MODE_SHOW_BOUNCER or not. The program call mStatusBarKeyguardViewManager.showBouncer in FingerprintUnlockController.showBouncer when the mode is MODE_SHOW_BOUNCER. Bug: 79614864 Test: atest SystemUITests Change-Id: I9dc031628d51eb80a05e16f5520c75a74b81d9dc Fix: 79614864
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java
index c4a78149f42e..76860e62435a 100644
--- 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;