Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE

Browse Source 
* commit 'f49e4d3f182071081537dba3387db20cae27c427':
  Temporary re-enabling iface name change handling on HO
This commit is contained in:
Wink Saville
2011-06-23 18:25:38 -07:00
committed by Android Git Automerger
parent 7c58d671d5 f49e4d3f18
commit 7eff4bb3f9
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/ConnectivityService.java
View File

@@ -1454,6 +1454,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) {
@@ -1896,7 +1906,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
services/java/com/android/server/connectivity/Tethering.java
View File

@@ -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;