diff options
| author | Wink Saville <wink@google.com> | 2011-02-24 17:58:51 -0800 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2011-02-24 18:23:36 -0800 |
| commit | 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82 (patch) | |
| tree | 844f05bd2168e872f5e2d8a0e49227fd665c5d20 /core/java/android/net/ConnectivityManager.java | |
| parent | 66d16910a84c9a67d854cf1d2d78cee94641be1f (diff) | |
LTE Changes for Telephony including Multiple PDN support and IPV6 support
Added init for CDMAPhone.java
Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index cab8ed25f0ab..26f375d43db3 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -221,12 +221,32 @@ public class ConnectivityManager /** {@hide} */ public static final int TYPE_DUMMY = 8; + /** {@hide} */ public static final int TYPE_ETHERNET = 9; - /** {@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; + /** + * 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; public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI; |