diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-07-03 02:37:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-03 02:37:46 +0000 |
| commit | 71e3d079d623b93ec8a66afa6a1281896c7cd2c6 (patch) | |
| tree | 2c8364dfdb2731537a389682e7fd3b4d0e6e1ff1 | |
| parent | 2799767886cc230d554ec7e7e9c7596b3e311e13 (diff) | |
| parent | 1b60d11b8f54f1ade45b80668601bc955041cf4f (diff) | |
| download | frameworks_base-71e3d079d623b93ec8a66afa6a1281896c7cd2c6.zip frameworks_base-71e3d079d623b93ec8a66afa6a1281896c7cd2c6.tar.gz frameworks_base-71e3d079d623b93ec8a66afa6a1281896c7cd2c6.tar.bz2 | |
Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class Vpn { 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()); } |