Merge "Prevent going through unnecessary networks"

2020-10-07 08:21:04 +00:00
parent 1839f9f7f8 c3207fbf8d
commit 836af202e0
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -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;
+                        }
                    }
                }
            }