commit 5c92fd06f91fa816548b15acddc256e357d4c19f
author Andreas Huber <andih@google.com> Wed Aug 29 16:13:31 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 29 16:13:31 2012 -0700
tree ab2a29fe94ea18a97c8ba0896842a8e0485c578d
parent 2fee05b1f4b08e611d1441fa9f588e758d43d6f4
parent ec309eb9b45a2c2f0ae5b94f0b545f3799be8186

am d58522bb: am 2f9a4410: Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev

* commit 'd58522bbd87cd09c8e7953a992a3b97f6ca7f30f':
  Fix wifi display shutdown deadlock.

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);
     }