drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."

Browse Source 
* commit 'd1eeb6747820f549ec724546a84e3860b4580587':
  Telephony: Modify code to check that PUK code length is always 8.
This commit is contained in:
Wink Saville
2014-01-26 08:43:28 -08:00
committed by Android Git Automerger
parent 8005b9af11 d1eeb67478
commit 5d2d911ad1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@ -4191,7 +4191,7 @@
<!-- Message shown when the user enters an invalid SIM pin password in PUK screen --> <!-- 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> <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 --> <!-- 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 --> <!-- 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 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 --> <!-- String shown in PUK screen when PIN codes don't match -->

2
packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
View File

@ -274,7 +274,7 @@ public class KeyguardSimPukView extends KeyguardAbsKeyInputView
private boolean checkPuk() { private boolean checkPuk() {
// make sure the puk is at least 8 digits long. // make sure the puk is at least 8 digits long.
if (mPasswordEntry.getText().length() >= 8) { if (mPasswordEntry.getText().length() == 8) {
mPukText = mPasswordEntry.getText().toString(); mPukText = mPasswordEntry.getText().toString();
return true; return true;
} }