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

am 3dbb5836: am 71e3d079: Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev

Browse Source 
* commit '3dbb583649afeecbd42122fbe1115d2974da021f':
  Make the VPN notice connectivity changes on stacked interfaces.
This commit is contained in:
Lorenzo Colitti
2015-07-03 03:02:24 +00:00
committed by Android Git Automerger
parent 052385da41 3dbb583649
commit 8dbec94501
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1135,7 +1135,7 @@ public class Vpn {
final ConnectivityManager cm = ConnectivityManager.from(mContext);
for (Network network : cm.getAllNetworks()) {
final LinkProperties lp = cm.getLinkProperties(network);
if (lp != null && mOuterInterface.equals(lp.getInterfaceName())) {
if (lp != null && lp.getAllInterfaceNames().contains(mOuterInterface)) {
final NetworkInfo networkInfo = cm.getNetworkInfo(network);
if (networkInfo != null) mOuterConnection.set(networkInfo.getType());
}