summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2014-09-03 19:35:47 -0700
committer Robert Greenwalt <rgreenwalt@google.com> 2014-09-03 20:57:41 -0700
commitf5b74f981fb4e67f77a78b7038785fb3871acaa6 (patch)
tree058448932003e4574b3702c06e4a2baab907d369
parentb10e39e7166e2c4854a3adb2c2d8fa9c72d816bf (diff)
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
-rw-r--r--core/java/android/net/NetworkRequest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index 83bdfaab0286..5a09b460b6a8 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;