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

am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

Browse Source 
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.
This commit is contained in:
John Wang
2011-02-15 12:38:38 -08:00
committed by Android Git Automerger
parent e0c9f2757b 29853a356b
commit 3901402600
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,8 +307,15 @@ public class UsimPhoneBookManager extends Handler implements IccConstants {
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) {