summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-07-08 18:17:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-07-08 18:17:03 +0000
commitca7f160921a4a1a5da32ebe8fab1067bd8998a1f (patch)
tree86eba1233c510ecc2217ae7d49c1780834d87c6e
parenta9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507 (diff)
parent0ad03bc59d090a0455f858d2f629834c105f6f37 (diff)
downloadframeworks_av-ca7f160921a4a1a5da32ebe8fab1067bd8998a1f.zip
frameworks_av-ca7f160921a4a1a5da32ebe8fab1067bd8998a1f.tar.gz
frameworks_av-ca7f160921a4a1a5da32ebe8fab1067bd8998a1f.tar.bz2
Merge "Prevent double disconnects in RTSPSource"
-rw-r--r--media/libmediaplayerservice/nuplayer/RTSPSource.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
index cf455bd..f2d5571 100644
--- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
@@ -459,6 +459,10 @@ void NuPlayer::RTSPSource::onConnected() {
}
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);