commit 9436e48eed5e9be6b98ec6eb7df43845fc781a44
author Marco Nelissen <marcone@google.com> Tue Sep 15 10:21:53 2015 -0700
committer Marco Nelissen <marcone@google.com> Tue Sep 15 10:22:02 2015 -0700
tree db233b73aa35035e2a3d7b6f148aa0ecd6691693
parent c367ca1762278277fb7a7d1156ce6e193ab524a3

Fix the fix

AMessage::find* returns a bool, not a status_t

Change-Id: I89a56181f088881de215e8e79843637eb1b7e8ff

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index f132cd1..1f2f8df 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -426,7 +426,7 @@
         return;
     }
     int32_t trackType;
-    if (format->findInt32("type", &trackType) != OK) {
+    if (!format->findInt32("type", &trackType)) {
         ALOGE("no track type");
         return;
     }
@@ -448,7 +448,7 @@
     }
 
     AString lang;
-    if (format->findString("language", &lang)) {
+    if (!format->findString("language", &lang)) {
         ALOGE("no language");
         return;
     }
@@ -1306,6 +1306,10 @@
     }
 
     sp<MetaData> audioMeta = mSource->getFormatMeta(true /* audio */);
+    if (audioMeta == NULL) {
+        ALOGE("no metadata for audio source");
+        return;
+    }
     audio_stream_type_t streamType = AUDIO_STREAM_MUSIC;
     if (mAudioSink != NULL) {
         streamType = mAudioSink->getAudioStreamType();