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

Commit f1cc3872 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Prevent going through unnecessary networks" am: 836af202 am:... 

Merge "Prevent going through unnecessary networks" am: 836af202 am: 7039b0ca am: c65f31e0 am: 22098057

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436691

Change-Id: I7211681be916abceacd2841548c8a118b1435f4c
parents c32e8960 22098057

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

+4 −1
Original line number Diff line number Diff line
@@ -2761,7 +2761,10 @@ public class Vpn { 
                    final LinkProperties lp = cm.getLinkProperties(network);

                    if (lp != null && lp.getAllInterfaceNames().contains(mOuterInterface)) {

                        final NetworkInfo networkInfo = cm.getNetworkInfo(network);

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

                        if (networkInfo != null) {

                            mOuterConnection.set(networkInfo.getType());

                            break;

                        }

                    }

                }

            }