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

Commit 99b1375e authored Oct 12, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Oct 12, 2015

Merge "Add Preferred Network menu"

parents ec79009d 7d54b3cc

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ public interface IccConstants {
		static final int EF_SST = 0x6f38;
		static final int EF_CFIS = 0x6FCB;
		static final int EF_IMG = 0x4f20;
		static final int EF_PLMN_SEL = 0x6F30;

		// USIM SIM file ids from TS 131.102
		public static final int EF_PBR = 0x4F30;

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,9 @@ public final class SIMFileHandler extends IccFileHandler implements IccConstants
		case EF_INFO_CPHS:
		case EF_CSP_CPHS:
		case EF_PLMNWACT:
		/* Support for reading user & operator PLMN list from SIM
		(3GPP spec TS 11.11; File EFPLMNsel is read from SIM*/
		case EF_PLMN_SEL:
		return MF_SIM + DF_GSM;
		}
		String path = getCommonIccEFPath(efid);

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,10 @@ public final class UsimFileHandler extends IccFileHandler implements IccConstant
		case EF_LI:
		case EF_PLMNWACT:
		return MF_SIM + DF_ADF;

		/* Support for reading user & operator PLMN list from SIM */
		/* 3GPP TS 11.11. File read : EFPLMNsel) */
		case EF_PLMN_SEL:
		return MF_SIM + DF_GSM;
		case EF_PBR:
		if (mUseLocalPb) {
		return MF_SIM + DF_ADF + DF_PHONEBOOK;