Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid NPE when missing underlyingCaps."

Browse Source 
am: 6522970c1e

Change-Id: Ibbd645fa42b8e6d4f4ae05260839ac87a2430519
This commit is contained in:
Jeff Sharkey
2018-01-03 19:47:22 +00:00
committed by android-build-merger
parent f8adea8255 6522970c1e
commit e35adbc4d2
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -305,6 +305,7 @@ public class Vpn {
} else { } else {
for (Network underlying : underlyingNetworks) { for (Network underlying : underlyingNetworks) {
final NetworkCapabilities underlyingCaps = cm.getNetworkCapabilities(underlying); final NetworkCapabilities underlyingCaps = cm.getNetworkCapabilities(underlying);
if (underlyingCaps == null) continue;
for (int underlyingType : underlyingCaps.getTransportTypes()) { for (int underlyingType : underlyingCaps.getTransportTypes()) {
transportTypes = ArrayUtils.appendInt(transportTypes, underlyingType); transportTypes = ArrayUtils.appendInt(transportTypes, underlyingType);
} }