Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b414526 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Invalid call forwarding indicator status check" am: fa3049fd

am: 918d0cdf

Change-Id: I4b42b1a5a32b2bdad1ee15ac7d67ba9d823a2e77
parents fb7ed3da 918d0cdf
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -501,10 +501,17 @@ public class SIMRecords extends IccRecords {
        }
    }

    // Validate data is !null and the MSP (Multiple Subscriber Profile)
    // byte is between 1 and 4. See ETSI TS 131 102 v11.3.0 section 4.2.64.
    // Validate data is !null.
    private boolean validEfCfis(byte[] data) {
        return ((data != null) && (data[0] >= 1) && (data[0] <= 4));
        if (data != null) {
            if (data[0] < 1 || data[0] > 4) {
                // The MSP (Multiple Subscriber Profile) byte should be between
                // 1 and 4 according to ETSI TS 131 102 v11.3.0 section 4.2.64.
                logw("MSP byte: " + data[0] + " is not between 1 and 4", null);
            }
            return true;
        }
        return false;
    }

    public int getVoiceMessageCount() {