1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/tv/tuner/cc/Cea708Parser.java b/src/com/android/tv/tuner/cc/Cea708Parser.java
index 92ab0620..d0f6cf11 100644
--- a/src/com/android/tv/tuner/cc/Cea708Parser.java
+++ b/src/com/android/tv/tuner/cc/Cea708Parser.java
@@ -140,6 +140,7 @@ public class Cea708Parser {
     private int mCommand = 0;
     private int mListenServiceNumber = 0;
     private boolean mDtvCcPacking = false;
+    private boolean mFirstServiceNumberDiscovered;
 
     // Assign a dummy listener in order to avoid null checks.
     private OnCea708ParserListener mListener = new OnCea708ParserListener() {
@@ -208,6 +209,15 @@ public class Cea708Parser {
         }
     }
 
+    public void clear() {
+        mDtvCcPacket.clear();
+        mCcPackets.clear();
+        mBuffer.setLength(0);
+        mDiscoveredNumBytes.clear();
+        mCommand = 0;
+        mDtvCcPacking = false;
+    }
+
     public void setListenServiceNumber(int serviceNumber) {
         mListenServiceNumber = serviceNumber;
     }
@@ -332,12 +342,14 @@ public class Cea708Parser {
                 mDiscoveredNumBytes.put(
                         serviceNumber, blockSize + mDiscoveredNumBytes.get(serviceNumber, 0));
             }
-            if (mLastDiscoveryLaunchedMs + DISCOVERY_PERIOD_MS < SystemClock.elapsedRealtime()) {
+            if (mLastDiscoveryLaunchedMs + DISCOVERY_PERIOD_MS < SystemClock.elapsedRealtime()
+                    || !mFirstServiceNumberDiscovered) {
                 for (int i = 0; i < mDiscoveredNumBytes.size(); ++i) {
                     int discoveredNumBytes = mDiscoveredNumBytes.valueAt(i);
                     if (discoveredNumBytes >= DISCOVERY_NUM_BYTES_THRESHOLD) {
                         int discoveredServiceNumber = mDiscoveredNumBytes.keyAt(i);
                         mListener.discoverServiceNumber(discoveredServiceNumber);
+                        mFirstServiceNumberDiscovered = true;
                     }
                 }
                 mDiscoveredNumBytes.clear();