diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-31 10:44:47 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-31 10:44:47 -0700 |
| commit | b1c6b0f1e2c9d80369ff62beae1305b837d8faca (patch) | |
| tree | 043797a90c901da0068f4e1a0cccd62a03f531e7 /services | |
| parent | 0b3973143191962d3c4372523ed450f6a5bf0863 (diff) | |
| download | frameworks_base-b1c6b0f1e2c9d80369ff62beae1305b837d8faca.zip frameworks_base-b1c6b0f1e2c9d80369ff62beae1305b837d8faca.tar.gz frameworks_base-b1c6b0f1e2c9d80369ff62beae1305b837d8faca.tar.bz2 | |
Fix the build.
Fix a bad merge.
Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ public class ConnectivityService extends IConnectivityManager.Stub { 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()) { |