From 4f5e626f69cd4cfcfecdb3253ef5d7c6e1a24c43 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 2 Jan 2018 11:46:32 -0700
Subject: [PATCH] Avoid NPE when missing underlyingCaps.

Test: builds, boots
Bug: 70391265
Change-Id: I0f3d3f96596eca3455bcbb29af04c8b34cb18d38
---
 services/core/java/com/android/server/connectivity/Vpn.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 7715727f6d73e..c7a43153c0aa9 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 @@ 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);
                 }