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

Commit 71e3d079 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

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

parents 27997678 1b60d11b

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1135,7 +1135,7 @@ public class Vpn { 
                final ConnectivityManager cm = ConnectivityManager.from(mContext);

                final ConnectivityManager cm = ConnectivityManager.from(mContext);

                for (Network network : cm.getAllNetworks()) {

                for (Network network : cm.getAllNetworks()) {

                    final LinkProperties lp = cm.getLinkProperties(network);

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

                        final NetworkInfo networkInfo = cm.getNetworkInfo(network);

                        if (networkInfo != null) mOuterConnection.set(networkInfo.getType());

                        if (networkInfo != null) mOuterConnection.set(networkInfo.getType());

                    }

                    }