diff options
| author | Andreas Huber <andih@google.com> | 2012-08-29 16:10:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-29 16:10:01 -0700 |
| commit | 2f9a44101f4fd372834c67150aea76a07b94b5ec (patch) | |
| tree | 668d7d0ca31f28f267ffe1331157b56996911e6e /media | |
| parent | d8ee4e56f92eeb44ddc0997efe280b9f28ad814d (diff) | |
| parent | 2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107 (diff) | |
| download | frameworks_av-2f9a44101f4fd372834c67150aea76a07b94b5ec.zip frameworks_av-2f9a44101f4fd372834c67150aea76a07b94b5ec.tar.gz frameworks_av-2f9a44101f4fd372834c67150aea76a07b94b5ec.tar.bz2 | |
Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 4 |
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); } |