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

Commit 3c2d3667 authored by jsh's avatar jsh Committed by Android Git Automerger
Browse files

am 036e2108: Fix NPE when importing from USIM. 

Merge commit '036e2108' into eclair-plus-aosp

* commit '036e2108':
  Fix NPE when importing from USIM.
parents 47f1d4d5 036e2108

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

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants { 
    private void readAdnFileAndWait(int recNum) {

        Map <Integer,Integer> fileIds;

        fileIds = mPbrFile.mFileIds.get(recNum);

        if (fileIds == null) return;

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



        mAdnCache.requestLoadAllAdnLike(fileIds.get(USIM_EFADN_TAG),

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