commit f7dae30b20bf173190c0b68b7e49a5cffbd32e61
author Robert Greenwalt <rgreenwalt@google.com> Thu Mar 31 10:44:47 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Thu Mar 31 10:44:47 2011 -0700
tree 03f3c0404777beb5546d28b653ba3469ebd0f03e
parent 3a378b9f2d889fff5d0f595682d8525d5ad0acdf

Fix the build.

Fix a bad merge.

Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index c26b051..3a3f5e1 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1348,10 +1348,10 @@
                     String defaultIface = linkProperties.getInterfaceName();
                     if (defaultIface != null &&
                             !defaultIface.equals(newLinkProperties.getInterfaceName())) {
-                        mNetTrackers[netType].removeDefaultRoute();
+                        removeDefaultRoute(mNetTrackers[netType]);
                     }
                 }
-                mNetTrackers[netType].addPrivateDnsRoutes();
+                addPrivateDnsRoutes(mNetTrackers[netType]);
             }
         } else {
             if (mNetAttributes[netType].isDefault()) {