summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-11-23 16:51:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-23 16:51:47 -0800
commit40da453ec59fc54b274beba2f26484a45eb4ac54 (patch)
tree6c602335bcd148aca7d9c5743c19b2e43c528442
parent8556439ef964f9667586e154193bb978eb6ba509 (diff)
parent08b52112335dcbcd51fa387c2a9a92dc43efa689 (diff)
downloadframeworks_base-40da453ec59fc54b274beba2f26484a45eb4ac54.zip
frameworks_base-40da453ec59fc54b274beba2f26484a45eb4ac54.tar.gz
frameworks_base-40da453ec59fc54b274beba2f26484a45eb4ac54.tar.bz2
am 08b52112: am e95f4986: Merge "Fix a build break." into ics-mr1
* commit '08b52112335dcbcd51fa387c2a9a92dc43efa689': Fix a build break.
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java4
1 files changed, 2 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 ff2d237..de09dfb 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -1851,8 +1851,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
// TODO We may use apnContext.getApnSetting() directly
// instead of getWaitingApns().get(0)
String apnStr = "<unknown>";
- if (apnContext.getWaitngApns() != null
- && !apnContext.getWatingApns().isEmpty()){
+ if (apnContext.getWaitingApns() != null
+ && !apnContext.getWaitingApns().isEmpty()){
apnStr = apnContext.getWaitingApns().get(0).apn;
}
log("onDataSetupComplete: success apn=" + apnStr);