diff options
Diffstat (limited to 'src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java')
-rw-r--r-- | src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java b/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java index 0ae1b5ce79..4b5eebc6e2 100644 --- a/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java +++ b/src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java @@ -452,10 +452,12 @@ public class CarrierDisplayNameResolver { boolean forceDisplayNoService = mPhone.getServiceStateTracker().shouldForceDisplayNoService() && !isSimReady; ServiceState ss = getServiceState(); + // The slot is emc only or oos but the device is emc only. + boolean isEmcOnly = ss.isEmergencyOnly() || Phone.isEmergencyCallOnly(); if (ss.getState() == ServiceState.STATE_POWER_OFF && !forceDisplayNoService - && !Phone.isEmergencyCallOnly()) { + && !isEmcOnly) { plmn = null; - } else if (forceDisplayNoService || !Phone.isEmergencyCallOnly()) { + } else if (forceDisplayNoService || !isEmcOnly) { plmn = mContext.getResources().getString( com.android.internal.R.string.lockscreen_carrier_default); } else { |