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

Commit 57e4d5a3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev... 

Merge "Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev am: 2125e5c5 am: 3b9e26fb"
parents 0ff46696 f0cf0ce7

telephony/java/com/android/internal/telephony/uicc/IccUtils.java

+4 −4
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class IccUtils { 
    /**

     * PLMN (MCC/MNC) is encoded as per 24.008 10.5.1.3

     * Returns a concatenated string of MCC+MNC, stripping

     * all invalid character 'f'

     * all invalid character 'F'

     */

    public static String bcdPlmnToString(byte[] data, int offset) {

        if (offset + 3 > data.length) {
@@ -117,9 +117,9 @@ public class IccUtils { 
        trans[2] = (byte) ((data[2 + offset] & 0xF0) | ((data[1 + offset] >> 4) & 0xF));

        String ret = bytesToHexString(trans);



        // For a valid plmn we trim all character 'f'

        if (ret.contains("f")) {

            ret = ret.replaceAll("f", "");

        // For a valid plmn we trim all character 'F'

        if (ret.contains("F")) {

            ret = ret.replaceAll("F", "");

        }

        return ret;

    }