diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 28 | ||||
| -rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 9 | ||||
| -rw-r--r-- | core/java/android/provider/Telephony.java | 8 |
3 files changed, 5 insertions, 40 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; diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index 5b4da66..e04964e 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -437,8 +437,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { retValue = true; break; case Phone.APN_REQUEST_STARTED: - // set IDLE here , avoid the following second FAILED not sent out - mNetworkInfo.setDetailedState(DetailedState.IDLE, null, null); + // no need to do anything - we're already due some status update intents retValue = true; break; case Phone.APN_REQUEST_FAILED: @@ -547,12 +546,6 @@ public class MobileDataStateTracker implements NetworkStateTracker { return Phone.APN_TYPE_DUN; case ConnectivityManager.TYPE_MOBILE_HIPRI: return Phone.APN_TYPE_HIPRI; - case ConnectivityManager.TYPE_MOBILE_FOTA: - return Phone.APN_TYPE_FOTA; - case ConnectivityManager.TYPE_MOBILE_IMS: - return Phone.APN_TYPE_IMS; - case ConnectivityManager.TYPE_MOBILE_CBS: - return Phone.APN_TYPE_CBS; default: sloge("Error mapping networkType " + netType + " to apnType."); return null; diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index d2d2557..62f66b6 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -1723,14 +1723,6 @@ public final class Telephony { public static final String TYPE = "type"; - public static final String INACTIVE_TIMER = "inactivetimer"; - - // Only if enabled try Data Connection. - public static final String ENABLED = "enabled"; - - // Rules apply based on class. - public static final String CLASS = "class"; - /** * The protocol to be used to connect to this APN. * |