diff options
| author | John Wang <johnwang@google.com> | 2011-11-23 14:26:38 -0800 |
|---|---|---|
| committer | John Wang <johnwang@google.com> | 2011-11-23 14:26:38 -0800 |
| commit | 9b1080091c4ac97378db366cdd6961aba28756c5 (patch) | |
| tree | 963ed33a118457c40999e2d7668283726574cdb5 /telephony/java | |
| parent | 20398fac99ff78cb3ec3dd122930e45d409e0524 (diff) | |
| download | frameworks_base-9b1080091c4ac97378db366cdd6961aba28756c5.zip frameworks_base-9b1080091c4ac97378db366cdd6961aba28756c5.tar.gz frameworks_base-9b1080091c4ac97378db366cdd6961aba28756c5.tar.bz2 | |
Check watingApns before access it.
bug:5663125
Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
Diffstat (limited to 'telephony/java')
| -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) { |