diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-05-24 09:24:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-24 09:24:32 -0700 |
| commit | f2eb6fbc0a9d000a2037d69e381c0784ccb847af (patch) | |
| tree | 9752eeb64f0f91597c69a5ccc27948578209def7 /services | |
| parent | a44ff5034fc64aa9cf2cf288ff548b591518cd64 (diff) | |
| parent | 36a151abcd794524358a74599a1f4ab130ca7b55 (diff) | |
| download | frameworks_base-f2eb6fbc0a9d000a2037d69e381c0784ccb847af.zip frameworks_base-f2eb6fbc0a9d000a2037d69e381c0784ccb847af.tar.gz frameworks_base-f2eb6fbc0a9d000a2037d69e381c0784ccb847af.tar.bz2 | |
am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
Use the old interface when resetting connections
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 7 |
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 3e19094..37a8cb8 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); } } } |