diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-12-15 03:27:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-12-15 03:27:33 -0800 |
| commit | 56a2d4f3490f939d0fa10f41b9557f542931d77a (patch) | |
| tree | 624e9df85211fb01b134ff4df2a0c9d67e984f36 /src | |
| parent | bce408974c5d7446f1e8d29444214f1f97d798c5 (diff) | |
| parent | e550dddd4ddab7f659e2d3afe7c30cb3361949c8 (diff) | |
| download | android_frameworks_opt_telephony-56a2d4f3490f939d0fa10f41b9557f542931d77a.tar.gz android_frameworks_opt_telephony-56a2d4f3490f939d0fa10f41b9557f542931d77a.tar.bz2 android_frameworks_opt_telephony-56a2d4f3490f939d0fa10f41b9557f542931d77a.zip | |
Merge "Define EF MSPL/MLPL/PRL values and paths"
Diffstat (limited to 'src')
3 files changed, 13 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java b/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java index 38cc250eb..186adaebd 100644 --- a/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java +++ b/src/java/com/android/internal/telephony/uicc/CsimFileHandler.java @@ -44,8 +44,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) { diff --git a/src/java/com/android/internal/telephony/uicc/IccConstants.java b/src/java/com/android/internal/telephony/uicc/IccConstants.java index 527678ba2..8ef7a83f3 100644 --- a/src/java/com/android/internal/telephony/uicc/IccConstants.java +++ b/src/java/com/android/internal/telephony/uicc/IccConstants.java @@ -73,6 +73,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 @@ -97,6 +101,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"; diff --git a/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java b/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java index 58e939fa0..58d72cac9 100644 --- a/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java +++ b/src/java/com/android/internal/telephony/uicc/RuimFileHandler.java @@ -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); } |