diff options
| author | John Wang <johnwang@google.com> | 2011-11-23 15:39:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-23 15:39:34 -0800 |
| commit | e5c993790387628fca4d7e7ffa59e11ad19379c3 (patch) | |
| tree | 63ed53b7ec608b3ffaceed1e3f196aeef7bee044 /telephony | |
| parent | 8a743d90a973e4fcf52093f2a89a5c049b626480 (diff) | |
| parent | 39c293f4392f6c4bb4da6182123a0511cabb0df1 (diff) | |
| download | frameworks_base-e5c993790387628fca4d7e7ffa59e11ad19379c3.zip frameworks_base-e5c993790387628fca4d7e7ffa59e11ad19379c3.tar.gz frameworks_base-e5c993790387628fca4d7e7ffa59e11ad19379c3.tar.bz2 | |
am 39c293f4: am 9b108009: Check watingApns before access it.
* commit '39c293f4392f6c4bb4da6182123a0511cabb0df1':
Check watingApns before access it.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index 7cd01a1..ff2d237 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -1848,8 +1848,14 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { DataConnection dc = apnContext.getDataConnection(); if (DBG) { - log(String.format("onDataSetupComplete: success apn=%s", - apnContext.getWaitingApns().get(0).apn)); + // TODO We may use apnContext.getApnSetting() directly + // instead of getWaitingApns().get(0) + String apnStr = "<unknown>"; + if (apnContext.getWaitngApns() != null + && !apnContext.getWatingApns().isEmpty()){ + apnStr = apnContext.getWaitingApns().get(0).apn; + } + log("onDataSetupComplete: success apn=" + apnStr); } ApnSetting apn = apnContext.getApnSetting(); if (apn.proxy != null && apn.proxy.length() != 0) { |