summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-08-29 16:08:08 -0700
committerAndreas Huber <andih@google.com>2012-08-29 16:08:08 -0700
commit2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107 (patch)
tree5d03f1a61f3ed4fc960eb3ce43c623b795ad8ad2 /media/libstagefright
parentd7bee3a9d2ad76d073d91f0ee36d5ac5f9df480c (diff)
downloadframeworks_av-2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107.zip
frameworks_av-2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107.tar.gz
frameworks_av-2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107.tar.bz2
Fix wifi display shutdown deadlock.
Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/wifi-display/source/PlaybackSession.cpp4
1 files changed, 2 insertions, 2 deletions
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 @@ WifiDisplaySource::PlaybackSession::~PlaybackSession() {
sp<ISurfaceComposer> service = interface_cast<ISurfaceComposer>(binder);
CHECK(service != NULL);
- service->connectDisplay(NULL);
-
if (mSerializer != NULL) {
mSerializer->stop();
@@ -243,6 +241,8 @@ WifiDisplaySource::PlaybackSession::~PlaybackSession() {
mSerializerLooper.clear();
}
+ service->connectDisplay(NULL);
+
if (mRTCPSessionID != 0) {
mNetSession->destroySession(mRTCPSessionID);
}