summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-01-29 06:55:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-29 06:55:38 -0800
commitaa3866e6fa2d0c0e026b78cf43dccce67a2021e5 (patch)
tree7743ee10aedc5589dd261228ef59342bab2a403e /telephony/java/android
parent287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4 (diff)
parent6b739dc7292452227cdd8abd90658f4db8f0ce70 (diff)
downloadframeworks_base-aa3866e6fa2d0c0e026b78cf43dccce67a2021e5.zip
frameworks_base-aa3866e6fa2d0c0e026b78cf43dccce67a2021e5.tar.gz
frameworks_base-aa3866e6fa2d0c0e026b78cf43dccce67a2021e5.tar.bz2
am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70': Add some network types that OEM's are asking for.
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 27e08d4..69673b1 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -393,7 +393,10 @@ public class TelephonyManager {
public static final int NETWORK_TYPE_IDEN = 11;
/** Current network is EVDO revision B*/
public static final int NETWORK_TYPE_EVDO_B = 12;
-
+ /** @hide */
+ public static final int NETWORK_TYPE_LTE = 13;
+ /** @hide */
+ public static final int NETWORK_TYPE_EHRPD = 14;
/**
* Returns a constant indicating the radio technology (network type)