summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Liu <jminjie@google.com>2018-09-26 19:49:11 (GMT)
committerLuca Stefani <luca.stefani.ge1@gmail.com>2019-07-27 20:57:26 (GMT)
commit23042d81e4d490692f7dba1963a4423524ee16bc (patch)
tree6563394e4c8cbb79c3832bc62c69bc0a60ee2ce3
parent90a791ed53910b624b8f09086218c402e9b1174f (diff)
downloadframeworks_base-23042d81e4d490692f7dba1963a4423524ee16bc.zip
frameworks_base-23042d81e4d490692f7dba1963a4423524ee16bc.tar.gz
frameworks_base-23042d81e4d490692f7dba1963a4423524ee16bc.tar.bz2
Dismiss SIM lock page after correct SIM
Previously the criteria was to dismiss if: 1. There is no pin/password/pattern set AND 2. the lockscreen is disabled. This behaved incorrectly in the case where the lockscreen is enabled but there is no pin/password/pattern set. We fix the condition so that now we dismiss the SIM lock if: 1. There is no pin/password/pattern set OR 2. the lockscreen is disabled. Fixes: 115780994 Test: manual Change-Id: I88da896add635126934eb0ed22e617ac2607f15a
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index ff383dd..0f9f278 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -340,12 +340,11 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
case SimPuk:
// Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
- if (securityMode != SecurityMode.None
- || !mLockPatternUtils.isLockScreenDisabled(
+ if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(
KeyguardUpdateMonitor.getCurrentUser())) {
- showSecurityScreen(securityMode);
- } else {
finish = true;
+ } else {
+ showSecurityScreen(securityMode);
}
break;