diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-08 11:25:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-08 11:25:34 -0700 |
| commit | 9f0e05978e236352fd2a4a7c6dce909755c36ead (patch) | |
| tree | 539b172729d0a44025e5331c7a2fda6b1f86d0ae /media/libmediaplayerservice | |
| parent | 9a25c012915f2209fff1479b246ae8eba38c3eff (diff) | |
| parent | 7266bc80850dc327e9f18c27b81613f959399630 (diff) | |
| download | frameworks_av-9f0e05978e236352fd2a4a7c6dce909755c36ead.zip frameworks_av-9f0e05978e236352fd2a4a7c6dce909755c36ead.tar.gz frameworks_av-9f0e05978e236352fd2a4a7c6dce909755c36ead.tar.bz2 | |
am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '7266bc80850dc327e9f18c27b81613f959399630':
Prevent double disconnects in RTSPSource
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/RTSPSource.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp index 50ebf9c..3385a19 100644 --- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp +++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp @@ -634,6 +634,10 @@ void NuPlayer::RTSPSource::onSDPLoaded(const sp<AMessage> &msg) { } void NuPlayer::RTSPSource::onDisconnected(const sp<AMessage> &msg) { + if (mState == DISCONNECTED) { + return; + } + status_t err; CHECK(msg->findInt32("result", &err)); CHECK_NE(err, (status_t)OK); |