commit 13d6faa02087ce3bb0d4a02b8495f1822f211433
author Chong Zhang <chz@google.com> Fri Aug 22 15:35:28 2014 -0700
committer Chong Zhang <chz@google.com> Fri Aug 22 15:42:49 2014 -0700
tree 37cb5be49ca1a1d89433c98d512d7469d0d2e82a
parent d1de9bb33a2f645fb9dc54e7fc69ca45304850a5

wait for flush to finish before returning setSurface

Bug: 17187598
Change-Id: I091219e57158a4532044ca49342b57277d6ecb15

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 0a9b65c..3dbc0a2 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1732,6 +1732,13 @@
 
     // XXX - ignore error from setVideoScalingMode for now
     setVideoScalingMode(mVideoScalingMode);
+
+    if (mDriver != NULL) {
+        sp<NuPlayerDriver> driver = mDriver.promote();
+        if (driver != NULL) {
+            driver->notifySetSurfaceComplete();
+        }
+    }
 }
 
 void NuPlayer::onSourceNotify(const sp<AMessage> &msg) {