From ea266c65ee2412675fdb90e81478b93db2ccd272 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 3 Sep 2014 19:35:47 -0700 Subject: [PATCH] Catch creation of NetworkRequest without NetCap Using reflection you could do this and it would crash the system. Thanks, ServiceFuzzer! bug:17379629 Change-Id: I8b470bda78a69761ccd92496746f5d295b5d07f2 --- core/java/android/net/NetworkRequest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index 83bdfaab02..5a09b460b6 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -52,6 +52,9 @@ public class NetworkRequest implements Parcelable { * @hide */ public NetworkRequest(NetworkCapabilities nc, int legacyType, int rId) { + if (nc == null) { + throw new NullPointerException(); + } requestId = rId; networkCapabilities = nc; this.legacyType = legacyType;