Merge "Telephony: Add fix related to EF_IIDF file path" into cm-10.2 (8ad356a7) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -261,15 +261,12 @@ public abstract class IccFileHandler extends Handler implements IccConstants {
		onLoaded);

		logd("IccFileHandler: loadEFImgTransparent fileid = " + fileid
		+ " filePath = " + getEFPath(fileid) + " highOffset = " + highOffset
		+ " filePath = " + getEFPath(EF_IMG) + " highOffset = " + highOffset
		+ " lowOffset = " + lowOffset + " length = " + length);
		/*
		* Per TS 31.102, for displaying of Icon, under
		* DF Telecom and DF Graphics , EF instance(s) (4FXX,transparent files)
		* are present. The possible image file identifiers (EF instance) for
		* EF img ( 4F20, linear fixed file) are : 4F01 ... 4F05.
		*/
		mCi.iccIOForApp(COMMAND_READ_BINARY, fileid, getEFPath(fileid),

		//As per TS 31.102 and TS 11.11, all the image related EF_IIDF's
		//are located at MF_SIM + DF_TELECOM + DF_GRAPHICS, same path as EF_IMG.
		mCi.iccIOForApp(COMMAND_READ_BINARY, fileid, getEFPath(EF_IMG),
		highOffset, lowOffset,length, null, null, mAid, response);
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,9 @@ public final class RuimFileHandler extends IccFileHandler {
		Message response = obtainMessage(EVENT_READ_ICON_DONE, fileid, 0,
		onLoaded);

		mCi.iccIOForApp(COMMAND_GET_RESPONSE, fileid, getEFPath(fileid), 0, 0,
		//As per TS 31.102 and TS 11.11, all the image related EF_IIDF's
		//are located at MF_SIM + DF_TELECOM + DF_GRAPHICS, same path as EF_IMG.
		mCi.iccIOForApp(COMMAND_GET_RESPONSE, fileid, getEFPath(EF_IMG), 0, 0,
		GET_RESPONSE_EF_IMG_SIZE_BYTES, null, null,
		mAid, response);
		}