am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.

Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d'

* commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d':
  Fix NPE when importing from USIM.
This commit is contained in:
jsh
2010-01-27 18:39:58 -08:00
committed by Android Git Automerger

View File

@@ -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));