Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f5e626f authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Avoid NPE when missing underlyingCaps. 

Test: builds, boots
Bug: 70391265
Change-Id: I0f3d3f96596eca3455bcbb29af04c8b34cb18d38
parent 73200d9a

services/core/java/com/android/server/connectivity/Vpn.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

                }