diff options
| author | jsh <jsh@google.com> | 2010-01-27 18:39:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-27 18:39:58 -0800 |
| commit | ec22b4c468e5a47c64782a8d9f81f46cd3dbb2e1 (patch) | |
| tree | b012182e0ac891a5a8c172ac7b6bd0bed66ab4af /telephony | |
| parent | d47c6ed4a9f2b5bd31f6c806b74701428efe458b (diff) | |
| parent | 3c2d3667aa7ae20c95950270ccfa8932d1d3d32d (diff) | |
| download | frameworks_base-ec22b4c468e5a47c64782a8d9f81f46cd3dbb2e1.zip frameworks_base-ec22b4c468e5a47c64782a8d9f81f46cd3dbb2e1.tar.gz frameworks_base-ec22b4c468e5a47c64782a8d9f81f46cd3dbb2e1.tar.bz2 | |
am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.
Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d'
* commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d':
Fix NPE when importing from USIM.
Diffstat (limited to 'telephony')
| -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)); |