commit 68afca6d7caea032486d55b9feb58a811742a4c7
author Amy Zhang <amyjojo@google.com> Mon Jul 20 18:28:58 2020 -0700
committer Amy Zhang <amyjojo@google.com> Fri Jul 24 10:42:43 2020 -0700
tree a88aa9fdbf1853149e6bc138d71a442e08ce6588
parent 80cb96048b6c07666e508137201b4f2a03a6da34

Add the PTS field for recording-time indexing in the DemuxFilterEvent

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158816517
Change-Id: Ib29fd0f55aaae2fb44b77f754cceb5152fc7158d

tv/tuner/1.1/default/Tuner.cpp

diff --git a/tv/tuner/1.1/default/Tuner.cpp b/tv/tuner/1.1/default/Tuner.cpp
index 0a0667e..87a4d36 100644
--- a/tv/tuner/1.1/default/Tuner.cpp
+++ b/tv/tuner/1.1/default/Tuner.cpp
@@ -233,11 +233,10 @@
 
 void Tuner::removeDemux(uint32_t demuxId) {
     map<uint32_t, uint32_t>::iterator it;
-    for (it = mFrontendToDemux.begin(); it != mFrontendToDemux.end();) {
+    for (it = mFrontendToDemux.begin(); it != mFrontendToDemux.end(); it++) {
         if (it->second == demuxId) {
             it = mFrontendToDemux.erase(it);
-        } else {
-            it++;
+            break;
         }
     }
     mDemuxes.erase(demuxId);