Merge "Explicitly state all File constructor NPEs."
diff --git a/luni/src/main/java/java/io/File.java b/luni/src/main/java/java/io/File.java
index a07d34c..0592345 100644
--- a/luni/src/main/java/java/io/File.java
+++ b/luni/src/main/java/java/io/File.java
@@ -123,6 +123,8 @@
      *
      * @param path
      *            the path to be used for the file.
+     * @throws NullPointerException
+     *             if {@code path} is {@code null}.
      */
     public File(String path) {
         this.path = fixSlashes(path);
@@ -161,6 +163,8 @@
      * @param uri
      *            the Unified Resource Identifier that is used to construct this
      *            file.
+     * @throws NullPointerException
+     *             if {@code uri == null}.
      * @throws IllegalArgumentException
      *             if {@code uri} does not comply with the conditions above.
      * @see #toURI