From c9ff3ef62f96931e8e5b9acdded35ed84618ed45 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 28 Apr 2020 14:01:35 +0100
Subject: [PATCH] Create opt-in to throw when Player is accessed on wrong
 thread.

This allows users to verify their own usage before the default
value is changed to an opt-out.

issue:#4463
PiperOrigin-RevId: 308808722
---
 RELEASENOTES.md                               |  3 +++
 .../android/exoplayer2/SimpleExoPlayer.java   | 22 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b5cc309462..7bd66cb86d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,6 +3,9 @@
 ### dev-v2 (not yet released)
 
 *   Core library:
+    *   Add opt-in to verify correct thread usage with
+        `SimpleExoPlayer.setThrowsWhenUsingWrongThread(true)`
+        ([#4463](https://github.com/google/ExoPlayer/issues/4463)).
     *   Add playbackPositionUs parameter to 'LoadControl.shouldContinueLoading'.
     *   The `DefaultLoadControl` default minimum buffer is set to 50 seconds,
         equal to the default maximum buffer. `DefaultLoadControl` applies the
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index bddfa65b06..6952b5227c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -336,6 +336,9 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   private static final String TAG = "SimpleExoPlayer";
+  private static final String WRONG_THREAD_ERROR_MESSAGE =
+      "Player is accessed on the wrong thread. See "
+          + "https://exoplayer.dev/issues/player-accessed-on-wrong-thread";
 
   protected final Renderer[] renderers;
 
@@ -379,6 +382,7 @@ public class SimpleExoPlayer extends BasePlayer
   private List<Cue> currentCues;
   @Nullable private VideoFrameMetadataListener videoFrameMetadataListener;
   @Nullable private CameraMotionListener cameraMotionListener;
+  private boolean throwsWhenUsingWrongThread;
   private boolean hasNotifiedFullWrongThreadWarning;
   @Nullable private PriorityTaskManager priorityTaskManager;
   private boolean isPriorityTaskManagerRegistered;
@@ -1822,6 +1826,18 @@ public class SimpleExoPlayer extends BasePlayer
     streamVolumeManager.setMuted(muted);
   }
 
+  /**
+   * Sets whether the player should throw an {@link IllegalStateException} when methods are called
+   * from a thread other than the one associated with {@link #getApplicationLooper()}.
+   *
+   * <p>The default is {@code false}, but will change to {@code true} in the future.
+   *
+   * @param throwsWhenUsingWrongThread Whether to throw when methods are called from a wrong thread.
+   */
+  public void setThrowsWhenUsingWrongThread(boolean throwsWhenUsingWrongThread) {
+    this.throwsWhenUsingWrongThread = throwsWhenUsingWrongThread;
+  }
+
   // Internal methods.
 
   private void removeSurfaceCallbacks() {
@@ -1968,10 +1984,12 @@ public class SimpleExoPlayer extends BasePlayer
 
   private void verifyApplicationThread() {
     if (Looper.myLooper() != getApplicationLooper()) {
+      if (throwsWhenUsingWrongThread) {
+        throw new IllegalStateException(WRONG_THREAD_ERROR_MESSAGE);
+      }
       Log.w(
           TAG,
-          "Player is accessed on the wrong thread. See "
-              + "https://exoplayer.dev/issues/player-accessed-on-wrong-thread",
+          WRONG_THREAD_ERROR_MESSAGE,
           hasNotifiedFullWrongThreadWarning ? null : new IllegalStateException());
       hasNotifiedFullWrongThreadWarning = true;
     }