summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-09-26 11:00:49 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-26 11:00:50 -0700
commit44b175c31a96804d8f981c43145967473491540f (patch)
treecbbcd87cdc61a956b72eacf8fbe3605e0618654c
parent6283af5f0a99bc7cba43bb9d09bd920b438f47c8 (diff)
parentdf4ddebe61ac84c7773da1f774d13e4d4bbe9f72 (diff)
downloadframeworks_av-44b175c31a96804d8f981c43145967473491540f.zip
frameworks_av-44b175c31a96804d8f981c43145967473491540f.tar.gz
frameworks_av-44b175c31a96804d8f981c43145967473491540f.tar.bz2
Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." into jb-mr1-dev
-rw-r--r--media/libstagefright/wifi-display/source/WifiDisplaySource.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
index 7f7aeac..e9811f5 100644
--- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
+++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp
@@ -1221,8 +1221,11 @@ sp<WifiDisplaySource::PlaybackSession> WifiDisplaySource::findPlaybackSession(
void WifiDisplaySource::disconnectClient(status_t err) {
if (mClientSessionID != 0) {
if (mClientInfo.mPlaybackSession != NULL) {
- looper()->unregisterHandler(mClientInfo.mPlaybackSession->id());
+ sp<PlaybackSession> playbackSession = mClientInfo.mPlaybackSession;
mClientInfo.mPlaybackSession.clear();
+
+ playbackSession->destroy();
+ looper()->unregisterHandler(playbackSession->id());
}
mNetSession->destroySession(mClientSessionID);