resolved conflicts for merge of a3b4b5ca to master

Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
This commit is contained in:
Wink Saville
2011-07-08 12:49:14 -07:00
3 changed files with 29 additions and 8 deletions

View File

@@ -1602,8 +1602,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (linkProperties != null) {
String iface = linkProperties.getInterfaceName();
if (TextUtils.isEmpty(iface) == false) {
if (DBG) log("resetConnections(" + iface + ")");
NetworkUtils.resetConnections(iface);
if (DBG) {
log("resetConnections(" + iface + ", NetworkUtils.RESET_ALL_ADDRESSES)");
}
NetworkUtils.resetConnections(iface, NetworkUtils.RESET_ALL_ADDRESSES);
}
}
}