1 files changed, 38 insertions, 10 deletions

diff --git a/src/com/android/tv/tuner/tvinput/EventDetector.java b/src/com/android/tv/tuner/tvinput/EventDetector.java
index 27bbb8c7..96b20a4b 100644
--- a/src/com/android/tv/tuner/tvinput/EventDetector.java
+++ b/src/com/android/tv/tuner/tvinput/EventDetector.java
@@ -51,7 +51,7 @@ public class EventDetector {
     private final SparseArray<TunerChannel> mChannelMap = new SparseArray<>();
     private final SparseBooleanArray mVctCaptionTracksFound = new SparseBooleanArray();
     private final SparseBooleanArray mEitCaptionTracksFound = new SparseBooleanArray();
-    private final EventListener mEventListener;
+    private final List<EventListener> mEventListeners = new ArrayList<>();
     private int mFrequency;
     private String mModulation;
     private int mProgramNumber = ALL_PROGRAM_NUMBERS;
@@ -105,8 +105,10 @@ public class EventDetector {
                     item.setHasCaptionTrack();
                 }
             }
-            if (tunerChannel != null && mEventListener != null) {
-                mEventListener.onEventDetected(tunerChannel, items);
+            if (tunerChannel != null && !mEventListeners.isEmpty()) {
+                for (EventListener eventListener : mEventListeners) {
+                    eventListener.onEventDetected(tunerChannel, items);
+                }
             }
         }
 
@@ -117,8 +119,10 @@ public class EventDetector {
 
         @Override
         public void onAllVctItemsParsed() {
-            if (mEventListener != null) {
-                mEventListener.onChannelScanDone();
+            if (!mEventListeners.isEmpty()) {
+                for (EventListener eventListener : mEventListeners) {
+                    eventListener.onChannelScanDone();
+                }
             }
         }
 
@@ -161,8 +165,10 @@ public class EventDetector {
             if (!found) {
                 mVctProgramNumberSet.add(channelProgramNumber);
             }
-            if (mEventListener != null) {
-                mEventListener.onChannelDetected(tunerChannel, !found);
+            if (!mEventListeners.isEmpty()) {
+                for (EventListener eventListener : mEventListeners) {
+                    eventListener.onChannelDetected(tunerChannel, !found);
+                }
             }
         }
     };
@@ -197,11 +203,9 @@ public class EventDetector {
     /**
      * Creates a detector for ATSC TV channles and program information.
      * @param usbTunerInteface {@link TunerHal}
-     * @param listener for ATSC TV channels and program information
      */
-    public EventDetector(TunerHal usbTunerInteface, EventListener listener) {
+    public EventDetector(TunerHal usbTunerInteface) {
         mTunerHal = usbTunerInteface;
-        mEventListener = listener;
     }
 
     private void reset() {
@@ -258,4 +262,28 @@ public class EventDetector {
     public List<TunerChannel> getMalFormedChannels() {
         return mTsParser.getMalFormedChannels();
     }
+
+    /**
+     * Registers an EventListener.
+     * @param eventListener the listener to be registered
+     */
+    public void registerListener(EventListener eventListener) {
+        if (mTsParser != null) {
+            // Resets the version numbers so that the new listener can receive the EIT items.
+            // Otherwise, each EIT session is handled only once unless there is a new version.
+            mTsParser.resetDataVersions();
+        }
+        mEventListeners.add(eventListener);
+    }
+
+    /**
+     * Unregisters an EventListener.
+     * @param eventListener the listener to be unregistered
+     */
+    public void unregisterListener(EventListener eventListener) {
+        boolean removed = mEventListeners.remove(eventListener);
+        if (!removed && DEBUG) {
+            Log.d(TAG, "Cannot unregister a non-registered listener!");
+        }
+    }
 }