Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f9a4410 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev

parents d8ee4e56 2dff0f6a

media/libstagefright/wifi-display/source/PlaybackSession.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }