diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c09e417608..b2febbf244 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,8 +8,6 @@
             instead.
         *   `DefaultAnalyticsListener`. Use `AnalyticsListener` directly
             instead.
-        *   `DefaultEventListener.onTimelineChanged(Timeline, Object)`. Use
-            `Player.EventListener.onTimelineChanged(Timeline, int)` instead.
         *   `DefaultLoadControl` constructors. Use `DefaultLoadControl.Builder`
             instead.
         *   `DrmInitData.get(UUID)`. Use `DrmInitData.get(int)` and
@@ -22,6 +20,11 @@
             `MappedTrackInfo.getUnmappedTrackGroups()`.
         *   `MappedTrackInfo.length` - Use `MappedTrackInfo.getRendererCount()`
             instead.
+        *   `Player.DefaultEventListener.onTimelineChanged(Timeline, Object)`.
+            Use `Player.EventListener.onTimelineChanged(Timeline, int)` instead.
+        *   `Player.setAudioAttributes(AudioAttributes)`. Use
+            `Player.AudioComponent.setAudioAttributes(AudioAttributes, boolean)`
+            instead.
         *   `PlayerView.setDefaultArtwork(Bitmap)`. Use
             `PlayerView.setDefaultArtwork(Drawable)` instead.
         *   `PlayerView.setShowBuffering(boolean)`. Use
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
index 48774d697b..667d26e761 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -83,26 +83,6 @@ public interface Player {
      */
     void removeAudioListener(AudioListener listener);
 
-    /**
-     * Sets the attributes for audio playback, used by the underlying audio track. If not set, the
-     * default audio attributes will be used. They are suitable for general media playback.
-     *
-     * <p>Setting the audio attributes during playback may introduce a short gap in audio output as
-     * the audio track is recreated.
-     *
-     * <p>If tunneling is enabled by the track selector, the specified audio attributes will be
-     * ignored, but they will take effect if audio is later played without tunneling.
-     *
-     * <p>If the device is running a build before platform API version 21, audio attributes cannot
-     * be set directly on the underlying audio track. In this case, the usage will be mapped onto an
-     * equivalent stream type using {@link Util#getStreamTypeForAudioUsage(int)}.
-     *
-     * @param audioAttributes The attributes to use for audio playback.
-     * @deprecated Use {@link AudioComponent#setAudioAttributes(AudioAttributes, boolean)}.
-     */
-    @Deprecated
-    void setAudioAttributes(AudioAttributes audioAttributes);
-
     /**
      * Sets the attributes for audio playback, used by the underlying audio track. If not set, the
      * default audio attributes will be used. They are suitable for general media playback.
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 caada18f98..ca7313f47b 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
@@ -920,11 +920,6 @@ public class SimpleExoPlayer extends BasePlayer
     audioListeners.remove(listener);
   }
 
-  @Override
-  public void setAudioAttributes(AudioAttributes audioAttributes) {
-    setAudioAttributes(audioAttributes, /* handleAudioFocus= */ false);
-  }
-
   @Override
   public void setAudioAttributes(AudioAttributes audioAttributes, boolean handleAudioFocus) {
     verifyApplicationThread();