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

Commit 024da053 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Define EF MSPL/MLPL/PRL values and paths" am: 37e83705 

Change-Id: I16c05d945d9c5fcaa73cc7d0f0b0d7ba75cee0b8
parents e44fe6e8 37e83705

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

+4 −0
Original line number Diff line number Diff line
@@ -43,8 +43,12 @@ public final class CsimFileHandler extends IccFileHandler implements IccConstant 
        case EF_CSIM_IMSIM:

        case EF_CSIM_CDMAHOME:

        case EF_CSIM_EPRL:

        case EF_CSIM_PRL:

        case EF_CSIM_MIPUPP:

            return MF_SIM + DF_ADF;

        case EF_CSIM_MSPL:

        case EF_CSIM_MLPL:

            return MF_SIM + DF_TELECOM + DF_MMSS;

        }

        String path = getCommonIccEFPath(efid);

        if (path == null) {

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

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ public interface IccConstants { 
    static final int EF_CSIM_IMSIM = 0x6F22;

    static final int EF_CSIM_CDMAHOME = 0x6F28;

    static final int EF_CSIM_EPRL = 0x6F5A;

    static final int EF_CSIM_PRL = 0x6F30;

    // C.S0074-Av1.0 Section 4

    static final int EF_CSIM_MLPL = 0x4F20;

    static final int EF_CSIM_MSPL = 0x4F21;

    static final int EF_CSIM_MIPUPP = 0x6F4D;



    //ISIM access
@@ -103,6 +107,7 @@ public interface IccConstants { 
    static final String DF_GRAPHICS = "5F50";

    static final String DF_GSM = "7F20";

    static final String DF_CDMA = "7F25";

    static final String DF_MMSS = "5F3C";



    //UICC access

    static final String DF_ADF = "7FFF";

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

+4 −0
Original line number Diff line number Diff line
@@ -64,8 +64,12 @@ public final class RuimFileHandler extends IccFileHandler { 
        case EF_CSIM_IMSIM:

        case EF_CSIM_CDMAHOME:

        case EF_CSIM_EPRL:

        case EF_CSIM_PRL:

        case EF_CSIM_MIPUPP:

            return MF_SIM + DF_CDMA;

        case EF_CSIM_MSPL:

        case EF_CSIM_MLPL:

            return MF_SIM + DF_TELECOM + DF_MMSS;

        }

        return getCommonIccEFPath(efid);

    }