am f2eb6fbc: am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev

* commit 'f2eb6fbc0a9d000a2037d69e381c0784ccb847af':
  Use the old interface when resetting connections

1 files changed, 4 insertions, 3 deletions

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 3e19094bba71..37a8cb85c05c 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2261,9 +2261,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
         boolean resetDns = updateRoutes(newLp, curLp, mNetConfigs[netType].isDefault());
 
         if (resetMask != 0 || resetDns) {
-            LinkProperties linkProperties = mNetTrackers[netType].getLinkProperties();
-            if (linkProperties != null) {
-                for (String iface : linkProperties.getAllInterfaceNames()) {
+            if (curLp != null) {
+                for (String iface : curLp.getAllInterfaceNames()) {
                     if (TextUtils.isEmpty(iface) == false) {
                         if (resetMask != 0) {
                             if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")");
@@ -2285,6 +2284,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                                 if (DBG) loge("Exception resetting dns cache: " + e);
                             }
                         }
+                    } else {
+                        loge("Can't reset connection for type "+netType);
                     }
                 }
             }