diff options
| author | bsears <bsears@google.com> | 2018-06-10 05:50:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-10 05:50:30 +0000 |
| commit | 9b1f560ee56e0c7538f6656a9459a905416509f0 (patch) | |
| tree | b661a96d5f99350c74c99c18039782738b851fb9 | |
| parent | e0f55c35a5bd4146f14723e215480613ea5e835f (diff) | |
| parent | f058cc6211b4035ff823bf0719a63402f92d8d57 (diff) | |
| download | base-9b1f560ee56e0c7538f6656a9459a905416509f0.tar.gz | |
Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/CarrierText.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierText.java b/packages/SystemUI/src/com/android/keyguard/CarrierText.java index 5b0f1c39f74b..66475e29128d 100644 --- a/packages/SystemUI/src/com/android/keyguard/CarrierText.java +++ b/packages/SystemUI/src/com/android/keyguard/CarrierText.java @@ -334,8 +334,10 @@ public class CarrierText extends TextView { break; case SimPermDisabled: - carrierText = getContext().getText( - R.string.keyguard_permanent_disabled_sim_message_short); + carrierText = makeCarrierStringOnEmergencyCapable( + getContext().getText( + R.string.keyguard_permanent_disabled_sim_message_short), + text); break; case SimMissingLocked: |