Fix the build.
Fix a bad merge. Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
This commit is contained in:
@@ -1348,10 +1348,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||||||
String defaultIface = linkProperties.getInterfaceName();
|
String defaultIface = linkProperties.getInterfaceName();
|
||||||
if (defaultIface != null &&
|
if (defaultIface != null &&
|
||||||
!defaultIface.equals(newLinkProperties.getInterfaceName())) {
|
!defaultIface.equals(newLinkProperties.getInterfaceName())) {
|
||||||
mNetTrackers[netType].removeDefaultRoute();
|
removeDefaultRoute(mNetTrackers[netType]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mNetTrackers[netType].addPrivateDnsRoutes();
|
addPrivateDnsRoutes(mNetTrackers[netType]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (mNetAttributes[netType].isDefault()) {
|
if (mNetAttributes[netType].isDefault()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user