LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 2ff2707d: am 57c83bb4: Small fix to 5008973 fix.

Browse Source 
* commit '2ff2707df406578bad4484647782462577c5a6ff':
  Small fix to 5008973 fix.
This commit is contained in:
Robert Greenwalt
2011-07-15 11:03:52 -07:00
committed by Android Git Automerger
parent 3079c1666e 2ff2707df4
commit 804e1eaec6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1083,12 +1083,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (r.isHostRoute() == false) { if (r.isHostRoute() == false) {
RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getRoutes(), r.getGateway()); RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getRoutes(), r.getGateway());
if (bestRoute != null) { if (bestRoute != null) {
if (bestRoute.getGateway().equals(r.getGateway()) == false) { if (bestRoute.getGateway().equals(r.getGateway())) {
bestRoute = RouteInfo.makeHostRoute(r.getGateway(), bestRoute.getGateway()); // if there is no better route, add the implied hostroute for our gateway
} else {
bestRoute = RouteInfo.makeHostRoute(r.getGateway()); bestRoute = RouteInfo.makeHostRoute(r.getGateway());
} else {
// if we will connect to our gateway through another route, add a direct
// route to it's gateway
bestRoute = RouteInfo.makeHostRoute(r.getGateway(), bestRoute.getGateway());
} }
if (!modifyRoute(ifaceName, lp, bestRoute, cycleCount+1, doAdd)) return false; modifyRoute(ifaceName, lp, bestRoute, cycleCount+1, doAdd);
} }
} }
if (doAdd) { if (doAdd) {
@@ -1167,9 +1170,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
public void setDataDependency(int networkType, boolean met) { public void setDataDependency(int networkType, boolean met) {
enforceConnectivityInternalPermission(); enforceConnectivityInternalPermission();
if (DBG) {
log("setDataDependency(" + networkType + ", " + met + ")");
}
mHandler.sendMessage(mHandler.obtainMessage(EVENT_SET_DEPENDENCY_MET, mHandler.sendMessage(mHandler.obtainMessage(EVENT_SET_DEPENDENCY_MET,
(met ? ENABLED : DISABLED), networkType)); (met ? ENABLED : DISABLED), networkType));
} }