diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-09 16:26:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-09 16:26:28 +0000 |
| commit | 2a1ed46decbc8e21a39367a4b7770111392167c3 (patch) | |
| tree | eea005e04c20ac221aada2f383ea31f3faceacfe | |
| parent | 01c07a856de163dc9a6fd31ea4b42293d221ee63 (diff) | |
| parent | e0f2fa33d79c7351d6dd1f0738d548b6f4a62f87 (diff) | |
| download | base-2a1ed46decbc8e21a39367a4b7770111392167c3.tar.gz | |
Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
| -rw-r--r-- | media/jni/android_media_MediaScanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 6730e0a45194..b52044025ae3 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -350,7 +350,7 @@ android_media_MediaScanner_extractAlbumArt( int fd = jniGetFDFromFileDescriptor(env, fileDescriptor); MediaAlbumArt* mediaAlbumArt = reinterpret_cast<MediaAlbumArt*>(mp->extractAlbumArt(fd)); - if (mediaAlbumArt != NULL) { + if (mediaAlbumArt == NULL) { return NULL; } |