diff options
| author | 2014-01-25 21:51:34 +0000 | |
|---|---|---|
| committer | 2014-01-25 21:51:34 +0000 | |
| commit | d1eeb6747820f549ec724546a84e3860b4580587 (patch) | |
| tree | 0ba0aa77f4ee7a3e2622b84a78783f427145e645 | |
| parent | 3c30eff63fb33901df4e040ecce78f7755be588f (diff) | |
| parent | b8b7bd3185d5cf6c266ee40e74b515f526e18761 (diff) | |
Merge "Telephony: Modify code to check that PUK code length is always 8."
| -rw-r--r-- | core/res/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9025400a657c..986a0053e8b6 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4191,7 +4191,7 @@ <!-- Message shown when the user enters an invalid SIM pin password in PUK screen --> <string name="kg_invalid_sim_pin_hint">Type a PIN that is 4 to 8 numbers.</string> <!-- Message shown when the user enters an invalid PUK code in the PUK screen --> - <string name="kg_invalid_sim_puk_hint">PUK code should be 8 numbers or more.</string> + <string name="kg_invalid_sim_puk_hint">PUK code should be 8 numbers.</string> <!-- Message shown when the user enters an invalid PUK code --> <string name="kg_invalid_puk">Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM.</string> <!-- String shown in PUK screen when PIN codes don't match --> diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java index 6e9e83e8cc2f..d882eca1315a 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java @@ -274,7 +274,7 @@ public class KeyguardSimPukView extends KeyguardAbsKeyInputView private boolean checkPuk() { // make sure the puk is at least 8 digits long. - if (mPasswordEntry.getText().length() >= 8) { + if (mPasswordEntry.getText().length() == 8) { mPukText = mPasswordEntry.getText().toString(); return true; } |