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

Commit 85d7de3e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Avoid NPE when missing underlyingCaps." am: 6522970c am: e35adbc4 

am: 552ab5f4

Change-Id: Ifc8edb9643ee601e285557cb3c320e541a5d0f78
parents c77bb380 552ab5f4

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

                }