diff options
| author | Wink Saville <wink@google.com> | 2014-01-26 16:55:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-26 16:55:49 +0000 |
| commit | dafb2420a34a5b39aca6ddf993e86778edd76b5d (patch) | |
| tree | 47c9d2160458ca427453a8d497d4aff8b8237cb2 | |
| parent | 38eda9c42bf327f6f521c766ea716305e5f71c05 (diff) | |
| parent | d4b688cf97736eb4c543149686ab851b9ea21161 (diff) | |
| download | frameworks_base-dafb2420a34a5b39aca6ddf993e86778edd76b5d.zip frameworks_base-dafb2420a34a5b39aca6ddf993e86778edd76b5d.tar.gz frameworks_base-dafb2420a34a5b39aca6ddf993e86778edd76b5d.tar.bz2 | |
am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit 'd4b688cf97736eb4c543149686ab851b9ea21161':
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 9025400..986a005 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 6e9e83e..d882eca 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; } |