summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang, ArvinX <arvinx.wang@intel.com>2018-09-12 03:31:32 (GMT)
committerLuca Stefani <luca.stefani.ge1@gmail.com>2019-07-27 20:57:26 (GMT)
commit7042bf0420dcc4ca0380e6e1f4d786587e1ad0f2 (patch)
treeab567c33cd66445ded2cd8f844b40b0fa5b1395f
parentb221a9a139a85c153aaccb10f4a5c4f466130dc9 (diff)
downloadframeworks_base-7042bf0420dcc4ca0380e6e1f4d786587e1ad0f2.zip
frameworks_base-7042bf0420dcc4ca0380e6e1f4d786587e1ad0f2.tar.gz
frameworks_base-7042bf0420dcc4ca0380e6e1f4d786587e1ad0f2.tar.bz2
Fix the behavior of keyguard bouncer in a corner case
With Android Automotive, there's a cancel button on the bouncer that allows return to UserSwitcher. Due to specific implementation of CarStatusBarKeyguardViewManager, all KeyguardViews will be destroyed. With below steps, user can input PIN the 6th time. But it won't unlock the device even if it's the correct PIN. Test: 1. Set screen lock with pin, password or pattern Test: in Settings ->Security & location Test: 2. Lock the device with Power key Test: 3. Input wrong pin/password for 5 times, 30s timeout is prompted Test: 4. Quickly click cancel button and select the same user Test: 5. User can input PIN/password again bug: 119068682 Change-Id: Ia182902d38de93ad13cb39c333a1294764905e1f Signed-off-by: Wang, ArvinX <arvinx.wang@intel.com> Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java1
1 files changed, 1 insertions, 0 deletions
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 3b4a23a..f19ccf2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -235,6 +235,7 @@ public class KeyguardBouncer {
mShowingSoon = false;
if (mExpansion == EXPANSION_VISIBLE) {
mKeyguardView.onResume();
+ mKeyguardView.resetSecurityContainer();
}
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN);