| commit | 7adaefea55a905fb07257685f460609c3bd72566 | [log] [tgz] |
|---|---|---|
| author | Dichen Zhang <dichenzhang@google.com> | Wed Nov 04 00:16:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 04 00:16:50 2020 +0000 |
| tree | 40f5465faa1f82c355f4c28dc4d4d8a7d1eaf8a2 | |
| parent | c9ff3299caae6d3732225ade5708ad780a78d19d [diff] | |
| parent | 932ca9fb417823e1ec71e2ef18c84a69ea33f03e [diff] |
Merge "Add a null check in RTSPSource::stop" am: 2a692162a4 am: 40db8afe2a am: 371bfe9628 am: 932ca9fb41 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1456267 Change-Id: I460e8d9160db16bf76e2b5b1c57c07e9536f4e29
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp index 83da092..9533ae5 100644 --- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp +++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
@@ -146,7 +146,9 @@ } // Close socket before posting message to RTSPSource message handler. - close(mHandler->getARTSPConnection()->getSocket()); + if (mHandler != NULL) { + close(mHandler->getARTSPConnection()->getSocket()); + } sp<AMessage> msg = new AMessage(kWhatDisconnect, this);