From 568327ff2e2f4603270c3b2b492fb41738f4c883 Mon Sep 17 00:00:00 2001
From: Tofunmi Adigun-Hameed <tofunmi@google.com>
Date: Fri, 2 Jun 2023 09:15:38 +0000
Subject: [PATCH] Merge pull request #420 from changxiangzhong:fix/cp-missing

PiperOrigin-RevId: 537014587
(cherry picked from commit a739f6062e37df48db395ce8eb8f0aafb4856b0d)
---
 .../androidx/media3/common/util/ListenerSet.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/common/src/main/java/androidx/media3/common/util/ListenerSet.java b/libraries/common/src/main/java/androidx/media3/common/util/ListenerSet.java
index 0ab3bab541..4d193d7a9a 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/ListenerSet.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/ListenerSet.java
@@ -99,14 +99,20 @@ public final class ListenerSet<T extends @NonNull Object> {
    *     during one {@link Looper} message queue iteration were handled by the listeners.
    */
   public ListenerSet(Looper looper, Clock clock, IterationFinishedEvent<T> iterationFinishedEvent) {
-    this(/* listeners= */ new CopyOnWriteArraySet<>(), looper, clock, iterationFinishedEvent);
+    this(
+        /* listeners= */ new CopyOnWriteArraySet<>(),
+        looper,
+        clock,
+        iterationFinishedEvent,
+        /* throwsWhenUsingWrongThread= */ true);
   }
 
   private ListenerSet(
       CopyOnWriteArraySet<ListenerHolder<T>> listeners,
       Looper looper,
       Clock clock,
-      IterationFinishedEvent<T> iterationFinishedEvent) {
+      IterationFinishedEvent<T> iterationFinishedEvent,
+      boolean throwsWhenUsingWrongThread) {
     this.clock = clock;
     this.listeners = listeners;
     this.iterationFinishedEvent = iterationFinishedEvent;
@@ -117,7 +123,7 @@ public final class ListenerSet<T extends @NonNull Object> {
     @SuppressWarnings("nullness:methodref.receiver.bound")
     HandlerWrapper handler = clock.createHandler(looper, this::handleMessage);
     this.handler = handler;
-    throwsWhenUsingWrongThread = true;
+    this.throwsWhenUsingWrongThread = throwsWhenUsingWrongThread;
   }
 
   /**
@@ -149,7 +155,8 @@ public final class ListenerSet<T extends @NonNull Object> {
   @CheckResult
   public ListenerSet<T> copy(
       Looper looper, Clock clock, IterationFinishedEvent<T> iterationFinishedEvent) {
-    return new ListenerSet<>(listeners, looper, clock, iterationFinishedEvent);
+    return new ListenerSet<>(
+        listeners, looper, clock, iterationFinishedEvent, throwsWhenUsingWrongThread);
   }
 
   /**