commit c5b82a8328042be709129b5154eb95b7c4e5e47b
author John Wang <johnwang@google.com> Tue Feb 15 12:43:05 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 15 12:43:05 2011 -0800
tree 6395203e9ba222d2e9812e9bfa5fea39945e6989
parent fc2bb2fbc79524177c16997ead1a59bb471a77e9
parent 9ba9f26dc1226b63fc018f58d95d9b7336372c89

Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

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

diff --git a/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java b/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
index 41f3b23..a9efc98 100755
--- a/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
+++ b/telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
@@ -305,8 +305,15 @@
         fileIds = mPbrFile.mFileIds.get(recNum);
         if (fileIds == null || fileIds.isEmpty()) return;
 
+
+        int extEf = 0;
+        // Only call fileIds.get while EFEXT1_TAG is available
+        if (fileIds.containsKey(USIM_EFEXT1_TAG)) {
+            extEf = fileIds.get(USIM_EFEXT1_TAG);
+        }
+
         mAdnCache.requestLoadAllAdnLike(fileIds.get(USIM_EFADN_TAG),
-            fileIds.get(USIM_EFEXT1_TAG), obtainMessage(EVENT_USIM_ADN_LOAD_DONE));
+            extEf, obtainMessage(EVENT_USIM_ADN_LOAD_DONE));
         try {
             mLock.wait();
         } catch (InterruptedException e) {