Merge "Avoid NPE when missing underlyingCaps." am: 6522970c1e

am: e35adbc4d2 Change-Id: Iacd2f15ad31ec7d5c83b21674e1e1f106a5fbd96
2018-01-03 19:56:28 +00:00
parent 35d0ac5e07 e35adbc4d2
commit 552ab5f4b0
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -305,6 +305,7 @@ public class Vpn {
        } else {
            for (Network underlying : underlyingNetworks) {
                final NetworkCapabilities underlyingCaps = cm.getNetworkCapabilities(underlying);
+                if (underlyingCaps == null) continue;
                for (int underlyingType : underlyingCaps.getTransportTypes()) {
                    transportTypes = ArrayUtils.appendInt(transportTypes, underlyingType);
                }