diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-08 11:21:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-08 11:21:45 -0700 |
| commit | 7266bc80850dc327e9f18c27b81613f959399630 (patch) | |
| tree | 661b92b78a01707e05a62323b286132f8714b02f /media | |
| parent | 47a1fe04637793f48d808261b1fac47acc3de1e1 (diff) | |
| parent | ca7f160921a4a1a5da32ebe8fab1067bd8998a1f (diff) | |
| download | frameworks_av-7266bc80850dc327e9f18c27b81613f959399630.zip frameworks_av-7266bc80850dc327e9f18c27b81613f959399630.tar.gz frameworks_av-7266bc80850dc327e9f18c27b81613f959399630.tar.bz2 | |
am ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit 'ca7f160921a4a1a5da32ebe8fab1067bd8998a1f':
Prevent double disconnects in RTSPSource
Diffstat (limited to 'media')
| -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); |