diff options
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java index 4d26adf..0d74184 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java @@ -260,6 +260,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { mRemainingAttempts = -1; KeyguardUpdateMonitor.getInstance(getContext()) .reportSimUnlocked(mSubId); + mShowDefaultMessage = true; if (mCallback != null) { mCallback.dismiss(true); } @@ -327,8 +328,12 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { msg = rez.getString(R.string.kg_sim_pin_instructions); } else { SubscriptionInfo info = monitor.getSubscriptionInfoForSubId(mSubId); - CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash - msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName); + if (rez.getBoolean(R.bool.kg_sim_display_name)) { + CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash + msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName); + } else { + msg = rez.getString(R.string.kg_sim_pin_instructions); + } if (info != null) { color = info.getIconTint(); } |