am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."

* commit '2a1ed46decbc8e21a39367a4b7770111392167c3':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
This commit is contained in:
Elliott Hughes
2014-06-09 16:30:03 +00:00
committed by Android Git Automerger

View File

@@ -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;
}