drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix tethering when switching default connection" into honeycomb

Browse Source
This commit is contained in:
Robert Greenwalt
2011-01-25 10:27:51 -08:00
committed by Android (Google) Code Review
parent c1e7f2d371 05d8936f27
commit d14239a2fb
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/java/com/android/server/connectivity/Tethering.java
View File

@ -31,6 +31,7 @@ import android.net.ConnectivityManager;
import android.net.InterfaceConfiguration; import android.net.InterfaceConfiguration;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
import android.net.LinkProperties;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.os.Binder; import android.os.Binder;
import android.os.Environment; import android.os.Environment;
@ -1219,7 +1220,20 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
} }
protected String findActiveUpstreamIface() { protected String findActiveUpstreamIface() {
// check for what iface we can use - if none found switch to error. // check for what iface we can use - if none found switch to error.
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE); IBinder b = ServiceManager.getService(Context.CONNECTIVITY_SERVICE);
IConnectivityManager cm = IConnectivityManager.Stub.asInterface(b);
try {
LinkProperties defaultProp = cm.getActiveLinkProperties();
if (defaultProp != null) {
String iface = defaultProp.getInterfaceName();
for(String regex : mUpstreamIfaceRegexs) {
if (iface.matches(regex)) return iface;
}
}
} catch (RemoteException e) { }
b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
INetworkManagementService service = INetworkManagementService.Stub.asInterface(b); INetworkManagementService service = INetworkManagementService.Stub.asInterface(b);
String[] ifaces = new String[0]; String[] ifaces = new String[0];
@ -1390,7 +1404,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
} }
break; break;
case CMD_UPSTREAM_CHANGED: case CMD_UPSTREAM_CHANGED:
mTryCell = WAIT_FOR_NETWORK_TO_SETTLE; // need to try DUN immediately if Wifi goes down
mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE;
chooseUpstreamType(mTryCell); chooseUpstreamType(mTryCell);
mTryCell = !mTryCell; mTryCell = !mTryCell;
break; break;