diff options
| author | John Wang <johnwang@google.com> | 2011-02-15 12:40:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-15 12:40:49 -0800 |
| commit | d0789ec99593bf556c88ff866a81d23449df1911 (patch) | |
| tree | c78fc7d75651c247853216b0f3e1a4b06668b4ea /telephony | |
| parent | 80dcc6aebfbca724f49c83d30cdad51ef980f0db (diff) | |
| parent | 3901402600daa5ef9fbcae7b4b9400ee8ca1a317 (diff) | |
| download | frameworks_base-d0789ec99593bf556c88ff866a81d23449df1911.zip frameworks_base-d0789ec99593bf556c88ff866a81d23449df1911.tar.gz frameworks_base-d0789ec99593bf556c88ff866a81d23449df1911.tar.bz2 | |
am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
Only decode EXT1 tag when it is available.
Diffstat (limited to 'telephony')
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java | 9 |
1 files changed, 8 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 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 @@ 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) { |