Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev am: 9b1f560e

am: 1db1009d Change-Id: Ic209a039351987f0f2ac31ed71bff80abf8fdcb2

Merge "Include "emergency calls only" in disabled SIM strings." into pi-dev am: 9b1f560e
1a61e0ea · bsears · android-build-merger · 5d63f152 · 1db1009d · 1a61e0ea
Commit 1a61e0ea authored 6 years ago by bsears Committed by android-build-merger 6 years ago
--- 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(
+                carrierText = makeCarrierStringOnEmergencyCapable(
-                        R.string.keyguard_permanent_disabled_sim_message_short);
+                        getContext().getText(
+                                R.string.keyguard_permanent_disabled_sim_message_short),
+                        text);
                break;
            case SimMissingLocked: