commit f484952edd94c1b7ee82d7b108edc1ce08671cc4
author Lajos Molnar <lajos@google.com> Wed Dec 10 16:58:57 2014 -0800
committer Lajos Molnar <lajos@google.com> Wed Dec 10 16:59:39 2014 -0800
tree cff6a131fad2248c456eee1618849df35bcae67e
parent 7e45789f5fbcbe68075f57b6d17f72b7b48df546

mediaplayer: allow setVideoSurface before setDataSource

Bug: 18709604
Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index d433a4d..080cd52 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -537,7 +537,7 @@
             sp<RefBase> obj;
             CHECK(msg->findObject("native-window", &obj));
 
-            if (mSource->getFormat(false /* audio */) == NULL) {
+            if (mSource == NULL || mSource->getFormat(false /* audio */) == NULL) {
                 performSetSurface(static_cast<NativeWindowWrapper *>(obj.get()));
                 break;
             }