SIMRecords: If there's no EF_SPN record, fallback to EF_PNN

Turns out some SIM (TMobile US, at least) don't fill in the SPN, but
do insert a PNN record for home network (which in the case of a non-MVNO
are the same. a MVNO should always have the SPN filled anyway).

Change-Id: I18388bb071a49698015c76abefb58798f800946c

1 files changed, 6 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
index 58c6ff193..88181ba27 100644
--- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
@@ -1643,6 +1643,12 @@ public class SIMRecords extends IccRecords {
                     mRecordsEventsRegistrants.notifyResult(EVENT_SPN);
                 }else {
                     if (DBG) log("No SPN loaded in either CHPS or 3GPP");
+                    if (mPnnHomeName != null && mSpn == null) {
+                        if (DBG) log("Falling back to home network name for SPN");
+                        mSpn = mPnnHomeName;
+                        setSystemProperty(PROPERTY_ICC_OPERATOR_ALPHA, mSpn);
+                        mRecordsEventsRegistrants.notifyResult(EVENT_SPN);
+                    }
                 }
 
                 mSpnState = GetSpnFsmState.IDLE;