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

Commit c3207fbf authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Prevent going through unnecessary networks 

The outer interface is taken in the constructor of
LegacyVpnRunner. The interface is used to set the type of
connection type. One interface should not map to more than one
network. Go through all the network is unnecessary if the target
connection is found. Thus, skip other networks if target network
is found.

Bug: 169215213
Test: atest FrameworksNetTests
Test: build and manually test to add legacy vpn
Change-Id: I31096d07177f5ae168becb1b4311f7b8eeac855a
parent f2990228

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

+4 −1
Original line number Diff line number Diff line
@@ -2755,7 +2755,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;

                        }

                    }

                }

            }