commit 97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807
author Jean-Baptiste Queru <jbq@google.com> Fri Nov 19 16:21:31 2010 -0800
committer Jean-Baptiste Queru <jbq@google.com> Fri Nov 19 16:21:31 2010 -0800
tree ef4b95d5a0084d141be9865de1ef0b1f1d3b5e07
parent a9a25c3113b0c744f7d4e69c55fcd7a661ae4cfd
parent 6ed70d2d41f9929d1c3f5179d947766495f9efe5

resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf

media/libstagefright/StagefrightMediaScanner.cpp

diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp
index 1629e9f..8426ee7 100644
--- a/media/libstagefright/StagefrightMediaScanner.cpp
+++ b/media/libstagefright/StagefrightMediaScanner.cpp
@@ -127,10 +127,11 @@
             || !strcasecmp(extension, ".rtttl")
             || !strcasecmp(extension, ".rtx")
             || !strcasecmp(extension, ".ota")) {
-        return HandleMIDI(path, &client);
-    }
-
-    if (mRetriever->setDataSource(path) == OK
+        status_t status = HandleMIDI(path, &client);
+        if (status != OK) {
+            return status;
+        }
+    } else if (mRetriever->setDataSource(path) == OK
             && mRetriever->setMode(
                 METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) {
         const char *value;