commit 2f9a44101f4fd372834c67150aea76a07b94b5ec
author Andreas Huber <andih@google.com> Wed Aug 29 16:10:01 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 29 16:10:01 2012 -0700
tree 668d7d0ca31f28f267ffe1331157b56996911e6e
parent d8ee4e56f92eeb44ddc0997efe280b9f28ad814d
parent 2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107

Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev

media/libstagefright/wifi-display/source/PlaybackSession.cpp

diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
index 5095c15..96c9222 100644
--- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp
+++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
@@ -229,8 +229,6 @@
     sp<ISurfaceComposer> service = interface_cast<ISurfaceComposer>(binder);
     CHECK(service != NULL);
 
-    service->connectDisplay(NULL);
-
     if (mSerializer != NULL) {
         mSerializer->stop();
 
@@ -243,6 +241,8 @@
         mSerializerLooper.clear();
     }
 
+    service->connectDisplay(NULL);
+
     if (mRTCPSessionID != 0) {
         mNetSession->destroySession(mRTCPSessionID);
     }