commit e17fb5a149610484b4bcda31cde04abfd4e5d4ec
author Jake Hamby <jhamby@google.com> Thu Apr 18 14:39:46 2013 -0700
committer Jake Hamby <jhamby@google.com> Thu Apr 18 14:45:43 2013 -0700
tree 518240ec7738f33d8c45ba40339ce9f301483432
parent 66c86c834e26d143f5b0b822ba12a37948ef0528

Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.

After loading EF_CFF_CPHS, use it to set mCallForwardingEnabled flag
if EF_CFIS record is missing or invalid.

Also fixes a few typos and updates an incorrect Javadoc comment.

Bug: 8554894
Change-Id: I3dfe3c915ad15b65781cd4e4d65cfa5c71a46ad6

src/java/com/android/internal/telephony/uicc/SIMRecords.java

diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
index 2927e86..6a961a2 100644
--- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
@@ -499,7 +499,7 @@
                         obtainMessage (EVENT_UPDATE_DONE, EF_CFF_CPHS));
             }
         } catch (ArrayIndexOutOfBoundsException ex) {
-            logw("Error saving call fowarding flag to SIM. "
+            logw("Error saving call forwarding flag to SIM. "
                             + "Probably malformed SIM record", ex);
 
         }
@@ -896,14 +896,14 @@
                 log("EF_CFF_CPHS: " + IccUtils.bytesToHexString(data));
                 mEfCff = data;
 
-                if (validEfCfis(mEfCfis)) {
+                // if EF_CFIS is valid, prefer it to EF_CFF_CPHS
+                if (!validEfCfis(mEfCfis)) {
                     mCallForwardingEnabled =
                         ((data[0] & CFF_LINE1_MASK) == CFF_UNCONDITIONAL_ACTIVE);
 
                     mRecordsEventsRegistrants.notifyResult(EVENT_CFI);
                 } else {
-                    log("EVENT_GET_CFF_DONE: invalid mEfCfis="
-                            + IccUtils.bytesToHexString(mEfCfis));
+                    log("EVENT_GET_CFF_DONE: EF_CFIS is valid, ignoring EF_CFF_CPHS");
                 }
                 break;
 
@@ -1102,7 +1102,7 @@
 
                     // Refer TS 51.011 Section 10.3.46 for the content description
                     mCallForwardingEnabled = ((data[1] & 0x01) != 0);
-                    log("EF_CFIS: callFordwardingEnabled=" + mCallForwardingEnabled);
+                    log("EF_CFIS: callForwardingEnabled=" + mCallForwardingEnabled);
 
                     mRecordsEventsRegistrants.notifyResult(EVENT_CFI);
                 } else {
@@ -1225,9 +1225,8 @@
     }
 
     /**
-     * Dispatch 3GPP format message. Overridden for CDMA/LTE phones by
-     * {@link com.android.internal.telephony.cdma.CdmaLteUiccRecords}
-     * to send messages to the secondary 3GPP format SMS dispatcher.
+     * Dispatch 3GPP format message to registrant ({@code GSMPhone} or {@code CDMALTEPhone})
+     * to pass to the 3GPP SMS dispatcher for delivery.
      */
     protected int dispatchGsmMessage(SmsMessageBase message) {
         mNewSmsRegistrants.notifyResult(message);
@@ -1695,7 +1694,7 @@
         // Normally this is programmed as 10th service after the standard
         // services.
         int usedCspGroups = data.length / 2;
-        // This is the "Servive Group Number" of "Value Added Services Group".
+        // This is the "Service Group Number" of "Value Added Services Group".
         byte valueAddedServicesGroup = (byte)0xC0;
 
         mCspPlmnEnabled = true;