Merge change 27141 into eclair (a16ca5ec) · Commits · e / os / android_frameworks_base

core/java/android/net/MobileDataStateTracker.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -157,7 +157,8 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		// if we're not enabled but the APN Type is supported by this connection
		// we should record the interface name if one's provided. If the user
		// turns on this network we will need the interfacename but won't get
		// a fresh connected message - TODO fix this..
		// a fresh connected message - TODO fix this when we get per-APN
		// notifications
		if (state == Phone.DataState.CONNECTED) {
		if (DBG) Log.d(TAG, "replacing old mInterfaceName (" +
		mInterfaceName + ") with " +
		@@ -186,10 +187,13 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		if (mInterfaceName != null) {
		NetworkUtils.resetConnections(mInterfaceName);
		}
		if (DBG) Log.d(TAG, "clearing mInterfaceName for "+ mApnType +
		" as it DISCONNECTED");
		mInterfaceName = null;
		mDefaultGatewayAddr = 0;
		// can't do this here - ConnectivityService needs it to clear stuff
		// it's ok though - just leave it to be refreshed next time
		// we connect.
		//if (DBG) Log.d(TAG, "clearing mInterfaceName for "+ mApnType +
		// " as it DISCONNECTED");
		//mInterfaceName = null;
		//mDefaultGatewayAddr = 0;
		break;
		case CONNECTING:
		setDetailedState(DetailedState.CONNECTING, reason, apnName);
		@@ -310,6 +314,11 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		*/
		@Override
		public boolean teardown() {
		// since we won't get a notification currently (TODO - per APN notifications)
		// we won't get a disconnect message until all APN's on the current connection's
		// APN list are disabled. That means privateRoutes for DNS and such will remain on -
		// not a problem since that's all shared with whatever other APN is still on, but
		// ugly.
		setTeardownRequested(true);
		return (setEnableApn(mApnType, false) != Phone.APN_REQUEST_FAILED);
		}
		@@ -321,6 +330,7 @@ public class MobileDataStateTracker extends NetworkStateTracker {
		setTeardownRequested(false);
		switch (setEnableApn(mApnType, true)) {
		case Phone.APN_ALREADY_ACTIVE:
		// TODO - remove this when we get per-apn notifications
		mEnabled = true;
		// need to set self to CONNECTING so the below message is handled.
		mMobileDataState = Phone.DataState.CONNECTING;

core/java/android/net/NetworkStateTracker.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -124,11 +124,12 @@ public abstract class NetworkStateTracker extends Handler {

		public void addPrivateDnsRoutes() {
		if (DBG) Log.d(TAG, "addPrivateDnsRoutes for " + this +
		"(" + mInterfaceName + ")");
		"(" + mInterfaceName + ") - mPrivateDnsRouteSet = "+mPrivateDnsRouteSet);
		if (mInterfaceName != null && !mPrivateDnsRouteSet) {
		for (String addrString : getNameServers()) {
		int addr = NetworkUtils.lookupHost(addrString);
		if (addr != -1) {
		if (addr != -1 && addr != 0) {
		if (DBG) Log.d(TAG, " adding "+addrString+" ("+addr+")");
		NetworkUtils.addHostRoute(mInterfaceName, addr);
		}
		}

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

+20 −16

Original line number	Diff line number	Diff line
		@@ -425,26 +425,28 @@ public abstract class DataConnectionTracker extends Handler {
		* will be sent by the ConnectivityManager when a connection to
		* the APN has been established.
		*/
		public int enableApnType(String type) {
		public synchronized int enableApnType(String type) {
		int id = apnTypeToId(type);
		if (id == APN_INVALID_ID) {
		return Phone.APN_REQUEST_FAILED;
		}

		// If already active, return
		if(DBG) Log.d(LOG_TAG, "enableApnType("+type+"), isApnTypeActive = "
		+ isApnTypeActive(type) + " and state = " + state);

		if (isApnTypeActive(type)) {
		if (state == State.INITING) return Phone.APN_REQUEST_STARTED;
		else if (state == State.CONNECTED) return Phone.APN_ALREADY_ACTIVE;
		}

		if (!isApnTypeAvailable(type)) {
		return Phone.APN_TYPE_NOT_AVAILABLE;
		}

		// just because it's active doesn't mean we had it explicitly requested before
		// (a broad default may handle many types). make sure we mark it enabled
		// so if the default is disabled we keep the connection for others
		setEnabled(id, true);

		if (isApnTypeActive(type)) {
		if (state == State.INITING) return Phone.APN_REQUEST_STARTED;
		else if (state == State.CONNECTED) return Phone.APN_ALREADY_ACTIVE;
		}
		return Phone.APN_REQUEST_STARTED;
		}

		@@ -490,20 +492,21 @@ public abstract class DataConnectionTracker extends Handler {

		protected synchronized void onEnableApn(int apnId, int enabled) {
		if (DBG) {
		Log.d(LOG_TAG, "got EVENT_APN_ENABLE_REQUEST with apnType = " + apnId +
		" and enable = " + enabled);
		Log.d(LOG_TAG, "dataEnabled[apnId] = " + dataEnabled[apnId] +
		", enabledCount = " + enabledCount);
		Log.d(LOG_TAG, "EVENT_APN_ENABLE_REQUEST " + apnId + ", " + enabled);
		Log.d(LOG_TAG, " dataEnabled = " + dataEnabled[apnId] +
		", enabledCount = " + enabledCount +
		", isApnTypeActive = " + isApnTypeActive(apnIdToType(apnId)));
		}
		if (enabled == APN_ENABLED) {
		if (!dataEnabled[apnId]) {
		mRequestedApnType = apnIdToType(apnId);
		onEnableNewApn();

		dataEnabled[apnId] = true;
		enabledCount++;
		}
		onTrySetupData(null);
		String type = apnIdToType(apnId);
		if (!isApnTypeActive(type)) {
		mRequestedApnType = type;
		onEnableNewApn();
		}
		} else {
		// disable
		if (dataEnabled[apnId]) {
		@@ -511,7 +514,8 @@ public abstract class DataConnectionTracker extends Handler {
		enabledCount--;
		if (enabledCount == 0) {
		onCleanUpConnection(true, Phone.REASON_DATA_DISABLED);
		} else if (dataEnabled[APN_DEFAULT_ID] == true) {
		} else if (dataEnabled[APN_DEFAULT_ID] == true &&
		!isApnTypeActive(Phone.APN_TYPE_DEFAULT)) {
		mRequestedApnType = Phone.APN_TYPE_DEFAULT;
		onEnableNewApn();
		}