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

Commit 29853a35 authored by John Wang's avatar John Wang Committed by Android (Google) Code Review
Browse files

Merge "Only decode EXT1 tag when it is available." into gingerbread

parents d1ba051a c2cbc730

telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java

+8 −1
Original line number Diff line number Diff line
@@ -284,8 +284,15 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { 
        fileIds = mPbrFile.mFileIds.get(recNum);

        if (fileIds == null || fileIds.isEmpty()) return;





        int extEf = 0;

        // Only call fileIds.get while EFEXT1_TAG is available

        if (fileIds.containsKey(USIM_EFEXT1_TAG)) {

            extEf = fileIds.get(USIM_EFEXT1_TAG);

        }



        mAdnCache.requestLoadAllAdnLike(fileIds.get(USIM_EFADN_TAG),

            fileIds.get(USIM_EFEXT1_TAG), obtainMessage(EVENT_USIM_ADN_LOAD_DONE));

            extEf, obtainMessage(EVENT_USIM_ADN_LOAD_DONE));

        try {

            mLock.wait();

        } catch (InterruptedException e) {