am 64c92f75: am 08cb0024: Handle emergency calls only status in ServiceStateTracker.

Merge commit '64c92f75df7415084aa9f0b304f2a99089b6be9f'

* commit '64c92f75df7415084aa9f0b304f2a99089b6be9f':
  Handle emergency calls only status in ServiceStateTracker.

diff --cc telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index fffc3cb,5034e16..f61c9a4
--- 1/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
--- 2/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@@ -566,8 -568,11 +577,12 @@@ final class GsmServiceStateTracker exte
                  (rule & SIMRecords.SPN_RULE_SHOW_SPN) == SIMRecords.SPN_RULE_SHOW_SPN;
              boolean showPlmn =
                  (rule & SIMRecords.SPN_RULE_SHOW_PLMN) == SIMRecords.SPN_RULE_SHOW_PLMN;
+ 
+             if (mEmergencyOnly)
+                 showPlmn = true;
+ 
              Intent intent = new Intent(Intents.SPN_STRINGS_UPDATED_ACTION);
 +            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
              intent.putExtra(Intents.EXTRA_SHOW_SPN, showSpn);
              intent.putExtra(Intents.EXTRA_SPN, spn);
              intent.putExtra(Intents.EXTRA_SHOW_PLMN, showPlmn);