From f484952edd94c1b7ee82d7b108edc1ce08671cc4 Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Wed, 10 Dec 2014 16:58:57 -0800
Subject: mediaplayer: allow setVideoSurface before setDataSource

Bug: 18709604
Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
---
 media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'media/libmediaplayerservice')

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 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
             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;
             }
-- 
cgit v1.1