am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"

* commit '161b3624c2243cc5267287ebb5107cecffc918d1':
  Fix NullpointerException in MediaMetadataRetriever

media/java/android/media/MediaMetadataRetriever.java

@@ -59,6 +59,10 @@ public class MediaMetadataRetriever
      * @throws IllegalArgumentException If the path is invalid.
      */
     public void setDataSource(String path) throws IllegalArgumentException {
+        if (path == null) {
+            throw new IllegalArgumentException();
+        }
+
         FileInputStream is = null;
         try {
             is = new FileInputStream(path);