Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE (f49e4d3f) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -1440,6 +1440,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}
		}
		}

		// TODO: Temporary notifying upstread change to Tethering.
		// @see bug/4455071
		/** Notify TetheringService if interface name has been changed. */
		if (TextUtils.equals(mNetTrackers[netType].getNetworkInfo().getReason(),
		Phone.REASON_LINK_PROPERTIES_CHANGED)) {
		if (isTetheringSupported()) {
		mTethering.handleTetherIfaceChange();
		}
		}
		}

		private void addPrivateDnsRoutes(NetworkStateTracker nt) {
		@@ -1882,7 +1892,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		break;
		case NetworkStateTracker.EVENT_CONFIGURATION_CHANGED:
		info = (NetworkInfo) msg.obj;
		handleConnectivityChange(info.getType(), true);
		// TODO: Temporary allowing network configuration
		// change not resetting sockets.
		// @see bug/4455071
		handleConnectivityChange(info.getType(), false);
		break;
		case EVENT_CLEAR_NET_TRANSITION_WAKELOCK:
		String causedBy = null;

+8 −0

Original line number	Diff line number	Diff line
		@@ -709,6 +709,14 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
		return retVal;
		}

		//TODO: Temporary handling upstream change triggered without
		// CONNECTIVITY_ACTION. Only to accomodate interface
		// switch during HO.
		// @see bug/4455071
		public void handleTetherIfaceChange() {
		mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED);
		}

		class TetherInterfaceSM extends StateMachine {
		// notification from the master SM that it's not in tether mode
		static final int CMD_TETHER_MODE_DEAD = 1;