commit 6522970c1e743d4deb47b53fb66f76259343ea1e
author Jeff Sharkey <jsharkey@android.com> Wed Jan 03 19:33:00 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 03 19:33:00 2018 +0000
tree 90dcef487e67eabb7f3fd135b9cd52a6e4ee13a6
parent 1c876b73b3ce305ce9d07f623837f0ee1af2df06
parent 4f5e626f69cd4cfcfecdb3253ef5d7c6e1a24c43

Merge "Avoid NPE when missing underlyingCaps."

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);
                 }