| commit | 25934a0854671973a513556bb18986fb6f0a3f67 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Aug 29 16:08:08 2012 -0700 |
| committer | Andreas Huber <andih@google.com> | Wed Aug 29 16:08:08 2012 -0700 |
| tree | 4448576338404589c0c1dec0af04ed12d38d07d0 | |
| parent | 35213f1420c669f43314cb75eadea450d21a75cb [diff] |
Fix wifi display shutdown deadlock. Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
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); }