Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent going through unnecessary networks"

Browse Source
This commit is contained in:
Chiachang Wang
2020-10-07 08:21:04 +00:00
committed by Gerrit Code Review
parent 1839f9f7f8 c3207fbf8d
commit 836af202e0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -2761,7 +2761,10 @@ public class Vpn {
final LinkProperties lp = cm.getLinkProperties(network); final LinkProperties lp = cm.getLinkProperties(network);
if (lp != null && lp.getAllInterfaceNames().contains(mOuterInterface)) { if (lp != null && lp.getAllInterfaceNames().contains(mOuterInterface)) {
final NetworkInfo networkInfo = cm.getNetworkInfo(network); final NetworkInfo networkInfo = cm.getNetworkInfo(network);
if (networkInfo != null) mOuterConnection.set(networkInfo.getType()); if (networkInfo != null) {
mOuterConnection.set(networkInfo.getType());
break;
}
} }
} }
} }