commit 161b3624c2243cc5267287ebb5107cecffc918d1
author Marco Nelissen <marcone@google.com> Fri Jul 26 21:13:58 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 26 21:13:59 2013 +0000
tree 5ae4f46e1d0b5be2d7fe4555e335fd0b33bb8d6f
parent d547bcec5634f99195a2b12522b6977f61c40d55
parent 425916e4c5305b9bfff5b5d60d203363afcb7b89

Merge "Fix NullpointerException in MediaMetadataRetriever"

media/java/android/media/MediaMetadataRetriever.java

diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java
index 376bb2d..9014453 100644
--- a/media/java/android/media/MediaMetadataRetriever.java
+++ b/media/java/android/media/MediaMetadataRetriever.java
@@ -59,6 +59,10 @@
      * @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);