| commit | 2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107 | [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 | 5d03f1a61f3ed4fc960eb3ce43c623b795ad8ad2 | |
| parent | d7bee3a9d2ad76d073d91f0ee36d5ac5f9df480c [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); }