diff options
| author | Marco Nelissen <marcone@google.com> | 2013-07-26 14:55:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-26 14:55:00 -0700 |
| commit | 3f44fae1dd18aa3f57aed7cc5f1261d1713b0a89 (patch) | |
| tree | 84643089e2723ef1049eb7541aaf64515be4e1a9 | |
| parent | c82bcca5510a3d21113e7fbab16bbfe4d124e934 (diff) | |
| parent | 778029776bac60856af7e97e19deb7b1f42b1984 (diff) | |
| download | frameworks_base-3f44fae1dd18aa3f57aed7cc5f1261d1713b0a89.zip frameworks_base-3f44fae1dd18aa3f57aed7cc5f1261d1713b0a89.tar.gz frameworks_base-3f44fae1dd18aa3f57aed7cc5f1261d1713b0a89.tar.bz2 | |
am 77802977: am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"
* commit '778029776bac60856af7e97e19deb7b1f42b1984':
Fix NullpointerException in MediaMetadataRetriever
| -rw-r--r-- | media/java/android/media/MediaMetadataRetriever.java | 4 |
1 files changed, 4 insertions, 0 deletions
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 @@ 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); |