diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-09 16:37:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 16:37:31 +0000 |
| commit | f928103269c948b78e93478284cc565c0ba2b040 (patch) | |
| tree | c8fa31ce84fdfa932b7a233ebec04bdb0b31e221 /media/jni | |
| parent | 0a5b7784958c9c0b2afe9aa82ce640bfa50f8dc7 (diff) | |
| parent | ef00c16d62cf2217c44658ad9894810322551d28 (diff) | |
| download | frameworks_base-f928103269c948b78e93478284cc565c0ba2b040.zip frameworks_base-f928103269c948b78e93478284cc565c0ba2b040.tar.gz frameworks_base-f928103269c948b78e93478284cc565c0ba2b040.tar.bz2 | |
am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
* commit 'ef00c16d62cf2217c44658ad9894810322551d28':
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
Diffstat (limited to 'media/jni')
| -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 6730e0a..b520440 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; } |