commit 0c0e4138b87aafeece38a5f14abee4c18e67181b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 11 23:34:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 11 23:34:54 2021 +0000
tree a35f204dd2e93259fd0e2955ccdba0a20687ec46
parent 547b761f9839af63a0e715a69dc7826f02a3eba5
parent 3d17d7d5b4528ca87288c6a5ce5256f52de5e76e

Merge "Flush events before stopping filter."

tv/tuner/aidl/default/Filter.cpp

diff --git a/tv/tuner/aidl/default/Filter.cpp b/tv/tuner/aidl/default/Filter.cpp
index 5b6debb..5f61c8d 100644
--- a/tv/tuner/aidl/default/Filter.cpp
+++ b/tv/tuner/aidl/default/Filter.cpp
@@ -60,6 +60,12 @@
     }
 }
 
+void FilterCallbackScheduler::flushEvents() {
+    std::unique_lock<std::mutex> lock(mLock);
+    mCallbackBuffer.clear();
+    mDataLength = 0;
+}
+
 void FilterCallbackScheduler::setTimeDelayHint(int timeDelay) {
     // updating the setTimeDelay does not go into effect until the condition
     // variable times out or is notified.
@@ -335,6 +341,8 @@
         mFilterThread.join();
     }
 
+    mCallbackScheduler.flushEvents();
+
     return ::ndk::ScopedAStatus::ok();
 }
 

tv/tuner/aidl/default/Filter.h

diff --git a/tv/tuner/aidl/default/Filter.h b/tv/tuner/aidl/default/Filter.h
index a5adf4c..7298561 100644
--- a/tv/tuner/aidl/default/Filter.h
+++ b/tv/tuner/aidl/default/Filter.h
@@ -68,6 +68,8 @@
 
     bool hasCallbackRegistered() const;
 
+    void flushEvents();
+
   private:
     void start();
     void stop();