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

Commit 55edc0f9 authored by Rakesh Pallerla's avatar Rakesh Pallerla Committed by dhacker29
Browse files

Telephony: Add fix related to EF_IIDF file path 

As per TS 31.102 and TS 11.11, all the image related EF_IIDF's
and EF_IMG will be located at MF_SIM->DF_TELECOM->DF_GRAPHICS.

Changes made to ensure above absolute path is sent to ril for
reading all EF_IIDF(4fxx) file id's referenced in EF_IMG(4f20).

Remove hardcoded EF_IIDF file id's 4f01 thru 4f05, so that these
values do not get conflicts with other EF Id's (such as EF_ADN)

Change-Id: I8732d99cd3051fedc2b2e709df1d59203d7847d7
CRs-fixed: 477624
parent f2c1ee61

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);

    }

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

+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);

    }