commit 4f5e626f69cd4cfcfecdb3253ef5d7c6e1a24c43
author Jeff Sharkey <jsharkey@android.com> Tue Jan 02 11:46:32 2018 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Jan 02 11:48:18 2018 -0700
tree d389a6806798dda79460a43027c3f67e2cd91671
parent 73200d9ac9438d95f28f0b9df3a7eddbfbf18eae

Avoid NPE when missing underlyingCaps.

Test: builds, boots
Bug: 70391265
Change-Id: I0f3d3f96596eca3455bcbb29af04c8b34cb18d38

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