Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dbb5836 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android Git Automerger
Browse files

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

* commit '71e3d079':
  Make the VPN notice connectivity changes on stacked interfaces.
parents 8018e677 71e3d079

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

                    }