diff options
| author | Wink Saville <wink@google.com> | 2011-03-03 09:53:52 -0800 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2011-03-03 09:53:52 -0800 |
| commit | eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7 (patch) | |
| tree | 936d2b8c1e507d14477e2ddc541e6d10e009f2f6 /core/java/android/net/ConnectivityManager.java | |
| parent | 268c7111f65c1f27598464c5f29ef4621bbf0407 (diff) | |
| download | frameworks_base-eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7.zip frameworks_base-eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7.tar.gz frameworks_base-eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7.tar.bz2 | |
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82.
Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 28 |
1 files changed, 4 insertions, 24 deletions
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; |