commit d35d826fb50f71cf592a72d2dffd5dea75390da3
author Robert Greenwalt <rgreenwalt@google.com> Thu Sep 04 21:08:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 21:08:11 2014 +0000
tree 2d5343de9a92051e1cb482fe5a06a760fd44d253
parent 2d3f9033f8803d471720be60228d9894dd385488
parent f5b74f981fb4e67f77a78b7038785fb3871acaa6

Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev

core/java/android/net/NetworkRequest.java

diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index 83bdfaa..5a09b46 100644
--- a/core/java/android/net/NetworkRequest.java
+++ b/core/java/android/net/NetworkRequest.java
@@ -52,6 +52,9 @@
      * @hide
      */
     public NetworkRequest(NetworkCapabilities nc, int legacyType, int rId) {
+        if (nc == null) {
+            throw new NullPointerException();
+        }
         requestId = rId;
         networkCapabilities = nc;
         this.legacyType = legacyType;