LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: undetermined

Change-Id: I8f07781b0dc4658c4779439a6c8718d6cf458a45
This commit is contained in:
Robert Greenwalt
2021-05-31 06:16:41 +00:00
committed by Automerger Merge Worker
parent ed176483c3 3a004ee4a0
commit 63777c6540
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/ConnectivityService.java
View File

@@ -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);
}
}
}