diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-08 11:27:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-08 11:27:52 -0700 |
| commit | 1545d35f871ff3527a716af659ddadebe3253548 (patch) | |
| tree | b54f893fe56f9fdf2dc9ed7718f050f302cc6635 /media/libmediaplayerservice | |
| parent | 0bc32ae1a8ef45f98101b78bfe64798875b569e3 (diff) | |
| parent | 9f0e05978e236352fd2a4a7c6dce909755c36ead (diff) | |
| download | frameworks_av-1545d35f871ff3527a716af659ddadebe3253548.zip frameworks_av-1545d35f871ff3527a716af659ddadebe3253548.tar.gz frameworks_av-1545d35f871ff3527a716af659ddadebe3253548.tar.bz2 | |
am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '9f0e05978e236352fd2a4a7c6dce909755c36ead':
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); |