Merge "Fix the behavior of keyguard bouncer in a corner case" am: 6997660506

am: 576351dbb4

Change-Id: Iefd1d3ae5e8b1688c339a8b91bbbcf5de2131767
This commit is contained in:
Lucas Dupin
2018-11-26 02:38:27 -08:00
committed by android-build-merger

View File

@@ -226,6 +226,7 @@ public class KeyguardBouncer {
mShowingSoon = false; mShowingSoon = false;
if (mExpansion == EXPANSION_VISIBLE) { if (mExpansion == EXPANSION_VISIBLE) {
mKeyguardView.onResume(); mKeyguardView.onResume();
mKeyguardView.resetSecurityContainer();
} }
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN); StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN);