diff options
| author | jsh <jsh@google.com> | 2010-01-21 16:58:17 -0800 |
|---|---|---|
| committer | jsh <jsh@google.com> | 2010-01-21 16:58:17 -0800 |
| commit | 036e21083d9936425687d7de29e95b2c458a7e4a (patch) | |
| tree | 1bcf02c5cd16cba24ad1601a6d4d4365df5b1360 /telephony/java | |
| parent | b1780474e6e3e1d3c584166c2fde336a0cd1c43f (diff) | |
| download | frameworks_base-036e21083d9936425687d7de29e95b2c458a7e4a.zip frameworks_base-036e21083d9936425687d7de29e95b2c458a7e4a.tar.gz frameworks_base-036e21083d9936425687d7de29e95b2c458a7e4a.tar.bz2 | |
Fix NPE when importing from USIM.
Need to check if fileIds is empty.
b/2349232
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java b/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java index d27f240..9caae3d 100644 --- a/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java +++ b/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java @@ -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)); |