commit 85d7de3ee834c68bccd8fa02d285d99bb6920121
author Jeff Sharkey <jsharkey@android.com> Wed Jan 03 20:14:03 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 03 20:14:03 2018 +0000
tree 89e96e53b7afdcfd2d1723a1acb378767b828323
parent c77bb380ae281d0100b9e8c73f5d71822af6977b
parent 552ab5f4b08cdc1575089a502db9822b94075429

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

Change-Id: Ifc8edb9643ee601e285557cb3c320e541a5d0f78

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 7715727..c7a4315 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -305,6 +305,7 @@
         } 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);
                 }