From eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Thu, 3 Mar 2011 09:53:52 -0800 Subject: DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support" This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82. Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636 --- core/java/android/net/ConnectivityManager.java | 28 ++++---------------------- 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'core/java/android/net/ConnectivityManager.java') diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 26f375d..cab8ed2 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -221,32 +221,12 @@ public class ConnectivityManager /** {@hide} */ public static final int TYPE_DUMMY = 8; - /** {@hide} */ public static final int TYPE_ETHERNET = 9; - /** - * Over the air Adminstration. - * {@hide} - */ - public static final int TYPE_MOBILE_FOTA = 10; - - /** - * IP Multimedia Subsystem - * {@hide} - */ - public static final int TYPE_MOBILE_IMS = 11; - - /** - * Carrier Branded Services - * {@hide} - */ - public static final int TYPE_MOBILE_CBS = 12; - - /** {@hide} */ - public static final int MAX_RADIO_TYPE = TYPE_MOBILE_CBS; - - /** {@hide} */ - public static final int MAX_NETWORK_TYPE = TYPE_MOBILE_CBS; + /** {@hide} TODO: Need to adjust this for WiMAX. */ + public static final int MAX_RADIO_TYPE = TYPE_DUMMY; + /** {@hide} TODO: Need to adjust this for WiMAX. */ + public static final int MAX_NETWORK_TYPE = TYPE_DUMMY; public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI; -- cgit v1.1