| commit | 7b54d5796c127c140fa68a9c4ccb4efc304f0d26 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Mon Nov 26 02:38:27 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 26 02:38:27 2018 -0800 |
| tree | 4c8109bba6481ebd3688684ce74a4941d99b03df | |
| parent | 03c6d371aa91febe7beafcfb968d1de403615b12 [diff] | |
| parent | 576351dbb410a7bc9fb49c25a25a4a03a74f35c6 [diff] |
Merge "Fix the behavior of keyguard bouncer in a corner case" am: 6997660506 am: 576351dbb4 Change-Id: Iefd1d3ae5e8b1688c339a8b91bbbcf5de2131767
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 c74d09d..f7e6cc0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -226,6 +226,7 @@ mShowingSoon = false; if (mExpansion == EXPANSION_VISIBLE) { mKeyguardView.onResume(); + mKeyguardView.resetSecurityContainer(); } StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN);