commit 1b60d11b8f54f1ade45b80668601bc955041cf4f
author Lorenzo Colitti <lorenzo@google.com> Thu Jul 02 13:03:03 2015 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Jul 02 13:03:03 2015 +0900
tree bb319a13e316dec239c587bc33fe2bcd63bcd73c
parent 2bc8485ba79cf6fa95f80b105ed914d245178a0c

Make the VPN notice connectivity changes on stacked interfaces.

Currently, the VPN code only looks at base interfaces, so if
464xlat is in use, it will never disconnect when its underlying
network has disconnected. Use getAllInterfaceNames().contains()
instead of just comparing the base interface name.

Bug: 19336810
Change-Id: Id1ba2c80a09cec5098c6f512acdc0a05a939e9f3

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

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index e1ec8a6..2846185 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1135,7 +1135,7 @@
                 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());
                     }