commit 3c7f8b48fcae6f4b41b66c86008170166e43b428
author Andreas Huber <andih@google.com> Tue Feb 05 22:46:45 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 05 22:46:45 2013 +0000
tree f96f734b550e2461f4a67a5a4353792b1c82be75
parent 198a893671ce80d951625fe328a92073306660d0
parent 9575c96b6e418914e2ffc6741ecc8d71e3968dbe

Merge "Support for a "preparation" state that can take care of lengthy"

media/libmediaplayerservice/MediaPlayerFactory.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp
index bb441cc..1fb8b1a 100644
--- a/media/libmediaplayerservice/MediaPlayerFactory.cpp
+++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp
@@ -100,7 +100,7 @@
     }                                                   \
                                                         \
     if (0.0 == bestScore) {                             \
-        bestScore = getDefaultPlayerType();             \
+        ret = getDefaultPlayerType();                   \
     }                                                   \
                                                         \
     return ret;