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

Commit 6522970c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Gerrit Code Review
Browse files

Merge "Avoid NPE when missing underlyingCaps."

parents 1c876b73 4f5e626f

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

                }