commit 6a45b8b9bdb57da59c93d6aa2f706e1fa4aa4dcd
author Byeongjo Park <bjo.park@samsung.com> Thu Jul 08 21:27:22 2021 +0900
committer Lajos Molnar <lajos@google.com> Fri Jul 16 09:12:00 2021 -0700
tree a441514517594490d1b1e1dc30e77ff6fd8e33e4
parent 050b31fb6137abef8061ef02aa6a6d1ae0a0094c

RTSP: Do not close a rtsp socket before rtsp:teardown sent.

[Problem] Rtp packets are keep coming to DUT even
  after MediaPlayer stopped. it was spending network data
  usage even user closed the streaming.
[Cause] A rtsp socket closed before DUT sends rtsp:teardown.
  so that, rtp sesesion were alive till end of the stream.
[Solution] Prevent closing a socket before sending
  rtsp:teardown.

Bug: 193115006

Merged-in: I0190c20f0add446fcb4acac315bcb189381d5807
Change-Id: I0190c20f0add446fcb4acac315bcb189381d5807
Signed-off-by: Byeongjo Park <bjo.park@samsung.com>

media/libmediaplayerservice/nuplayer/RTSPSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
index 9533ae5..8e05de8 100644
--- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
@@ -145,15 +145,17 @@
         return;
     }
 
-    // Close socket before posting message to RTSPSource message handler.
-    if (mHandler != NULL) {
-        close(mHandler->getARTSPConnection()->getSocket());
-    }
-
     sp<AMessage> msg = new AMessage(kWhatDisconnect, this);
 
     sp<AMessage> dummy;
     msg->postAndAwaitResponse(&dummy);
+
+    // Close socket after posting message to RTSPSource message handler.
+    if (mHandler != NULL && mHandler->getARTSPConnection()->getSocket() >= 0) {
+        ALOGD("closing rtsp socket if not closed yet.");
+        close(mHandler->getARTSPConnection()->getSocket());
+    }
+
 }
 
 status_t NuPlayer::RTSPSource::feedMoreTSData() {