summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-12 14:56:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 14:56:00 -0700
commitd6e24ca28b0b6384fd9b3117713402a1f43fdef8 (patch)
treef97eb1d9a5b87097062726c20fe204b862a46b07 /core/java
parente8621534db97070cc40f729d1eb8074f2e69df9d (diff)
parent4adacd23d4c91569b16fe50419f1a91f68d805bd (diff)
downloadframeworks_base-d6e24ca28b0b6384fd9b3117713402a1f43fdef8.zip
frameworks_base-d6e24ca28b0b6384fd9b3117713402a1f43fdef8.tar.gz
frameworks_base-d6e24ca28b0b6384fd9b3117713402a1f43fdef8.tar.bz2
am 4adacd23: merge from open-source master
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken * commit '4adacd23d4c91569b16fe50419f1a91f68d805bd': Add support for EVDO Rev B
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/MobileDataStateTracker.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index 98f32b3..214510d 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -310,6 +310,9 @@ public class MobileDataStateTracker extends NetworkStateTracker {
case TelephonyManager.NETWORK_TYPE_EVDO_A:
networkTypeStr = "evdo";
break;
+ case TelephonyManager.NETWORK_TYPE_EVDO_B:
+ networkTypeStr = "evdo";
+ break;
}
return "net.tcp.buffersize." + networkTypeStr;
}