Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 036e2108: Fix NPE when importing from USIM.

Browse Source 
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp

* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
  Fix NPE when importing from USIM.
This commit is contained in:
jsh
2010-01-21 17:35:18 -08:00
committed by Android Git Automerger
parent 47f1d4d509 036e21083d
commit 3c2d3667aa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
View File

@@ -282,7 +282,7 @@ public class UsimPhoneBookManager extends Handler implements IccConstants {
private void readAdnFileAndWait(int recNum) { private void readAdnFileAndWait(int recNum) {
Map <Integer,Integer> fileIds; Map <Integer,Integer> fileIds;
fileIds = mPbrFile.mFileIds.get(recNum); fileIds = mPbrFile.mFileIds.get(recNum);
if (fileIds == null) return; if (fileIds == null || fileIds.isEmpty()) return;
mAdnCache.requestLoadAllAdnLike(fileIds.get(USIM_EFADN_TAG), mAdnCache.requestLoadAllAdnLike(fileIds.get(USIM_EFADN_TAG),
fileIds.get(USIM_EFEXT1_TAG), obtainMessage(EVENT_USIM_ADN_LOAD_DONE)); fileIds.get(USIM_EFEXT1_TAG), obtainMessage(EVENT_USIM_ADN_LOAD_DONE));