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

Commit 2b83e0c8 authored by Faren Liang's avatar Faren Liang Committed by Linux Build Service Account
Browse files

ICC: Get EF_PLMNWACT to support user controlled PLMN list. 

Add the EF_PLMNWACT ID into the SIM file handler.

Conflicts:
	src/java/com/android/internal/telephony/uicc/UsimFileHandler.java

Change-Id: I5c04729b6b7bfb6342c7fd3b968a9762eb92210a
parent 18645e77

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

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ public interface IccConstants { 
    static final int EF_PCSCF = 0x6f09;

    static final int EF_PSI = 0x6fe5;



    //plmnwact

    static final int EF_PLMNWACT = 0x6F60;



    // SMS record length from TS 51.011 10.5.3

    static public final int SMS_RECORD_LENGTH = 176;

    // SMS record length from C.S0023 3.4.27

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

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public final class SIMFileHandler extends IccFileHandler implements IccConstants 
        case EF_SPN_SHORT_CPHS:

        case EF_INFO_CPHS:

        case EF_CSP_CPHS:

        case EF_PLMNWACT:

            return MF_SIM + DF_GSM;

        }

        String path = getCommonIccEFPath(efid);

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public final class UsimFileHandler extends IccFileHandler implements IccConstant 
        case EF_GID1:

        case EF_GID2:

        case EF_LI:

        case EF_PLMNWACT:

            return MF_SIM + DF_ADF;



        case EF_PBR: