commit 3a004ee4a0d5bdaec917cb19e889daf75a42a998
author Robert Greenwalt <rgreenwalt@google.com> Fri May 24 09:24:32 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 24 09:24:32 2013 -0700
tree 35e63eb4562d505b5bfcea6eb91a1d9ab6d61f74
parent b2aa01c0dcbedefbbd07f09b130b0eadfea29b44
parent ec8a9e6200b0dc2c1c598f0e312785f5b8d7c788

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

* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections

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 3e19094..37a8cb8 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2261,9 +2261,8 @@
         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 @@
                                 if (DBG) loge("Exception resetting dns cache: " + e);
                             }
                         }
+                    } else {
+                        loge("Can't reset connection for type "+netType);
                     }
                 }
             }