diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Player.java b/library/common/src/main/java/com/google/android/exoplayer2/Player.java
index 50739cfc24..558c930773 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/Player.java
@@ -1761,6 +1761,9 @@ public interface Player {
    * Sets the {@link SurfaceHolder} that holds the {@link Surface} onto which video will be
    * rendered. The player will track the lifecycle of the surface automatically.
    *
+   * <p>The thread that calls the {@link SurfaceHolder.Callback} methods must be the thread
+   * associated with {@link #getApplicationLooper()}.
+   *
    * @param surfaceHolder The surface holder.
    */
   void setVideoSurfaceHolder(@Nullable SurfaceHolder surfaceHolder);
@@ -1777,6 +1780,9 @@ public interface Player {
    * Sets the {@link SurfaceView} onto which video will be rendered. The player will track the
    * lifecycle of the surface automatically.
    *
+   * <p>The thread that calls the {@link SurfaceHolder.Callback} methods must be the thread
+   * associated with {@link #getApplicationLooper()}.
+   *
    * @param surfaceView The surface view.
    */
   void setVideoSurfaceView(@Nullable SurfaceView surfaceView);
@@ -1793,6 +1799,9 @@ public interface Player {
    * Sets the {@link TextureView} onto which video will be rendered. The player will track the
    * lifecycle of the surface automatically.
    *
+   * <p>The thread that calls the {@link TextureView.SurfaceTextureListener} methods must be the
+   * thread associated with {@link #getApplicationLooper()}.
+   *
    * @param textureView The texture view.
    */
   void setVideoTextureView(@Nullable TextureView textureView);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index de1e8a00f4..c98e78e159 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -334,6 +334,9 @@ public interface ExoPlayer extends Player {
      * Sets the {@link SurfaceHolder} that holds the {@link Surface} onto which video will be
      * rendered. The player will track the lifecycle of the surface automatically.
      *
+     * <p>The thread that calls the {@link SurfaceHolder.Callback} methods must be the thread
+     * associated with {@link #getApplicationLooper()}.
+     *
      * @param surfaceHolder The surface holder.
      */
     void setVideoSurfaceHolder(@Nullable SurfaceHolder surfaceHolder);
@@ -350,6 +353,9 @@ public interface ExoPlayer extends Player {
      * Sets the {@link SurfaceView} onto which video will be rendered. The player will track the
      * lifecycle of the surface automatically.
      *
+     * <p>The thread that calls the {@link SurfaceHolder.Callback} methods must be the thread
+     * associated with {@link #getApplicationLooper()}.
+     *
      * @param surfaceView The surface view.
      */
     void setVideoSurfaceView(@Nullable SurfaceView surfaceView);
@@ -366,6 +372,9 @@ public interface ExoPlayer extends Player {
      * Sets the {@link TextureView} onto which video will be rendered. The player will track the
      * lifecycle of the surface automatically.
      *
+     * <p>The thread that calls the {@link TextureView.SurfaceTextureListener} methods must be the
+     * thread associated with {@link #getApplicationLooper()}.
+     *
      * @param textureView The texture view.
      */
     void setVideoTextureView(@Nullable TextureView textureView);