diff --git a/api/current.txt b/api/current.txt
index f0815ba083089..2060eba9c1e38 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -20930,7 +20930,6 @@ package android.media {
     method public int getContentType();
     method public int getFlags();
     method public int getUsage();
-    method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
     method public int getVolumeControlStream();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
diff --git a/api/system-current.txt b/api/system-current.txt
index 8863bd2f9564f..cd86c59f14413 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -22712,7 +22712,6 @@ package android.media {
     method public int getContentType();
     method public int getFlags();
     method public int getUsage();
-    method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
     method public int getVolumeControlStream();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
diff --git a/api/test-current.txt b/api/test-current.txt
index 49c086c9fc370..1c395061f60b9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -21037,7 +21037,6 @@ package android.media {
     method public int getContentType();
     method public int getFlags();
     method public int getUsage();
-    method public static deprecated int getVolumeControlStream(android.media.AudioAttributes);
     method public int getVolumeControlStream();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index 77a82ec8cacdd..e36ceb8a3e131 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -913,29 +913,6 @@ public final class AudioAttributes implements Parcelable {
         }
     }
 
-    // TODO remove, replaced by non-static API getVolumeControlStream()
-    /**
-     * Returns the stream type matching the given attributes for volume control.
-     * Use this method to derive the stream type needed to configure the volume
-     * control slider in an {@link android.app.Activity} with
-     * {@link android.app.Activity#setVolumeControlStream(int)}.
-     * <BR>Do not use this method to set the stream type on an audio player object
-     * (e.g. {@link AudioTrack}, {@link MediaPlayer}) as this is deprecated,
-     * use <code>AudioAttributes</code> instead.
-     * @param aa non-null AudioAttributes.
-     * @return a valid stream type for <code>Activity</code> or stream volume control that matches
-     *     the attributes, or {@link AudioManager#USE_DEFAULT_STREAM_TYPE} if there isn't a direct
-     *     match. Note that <code>USE_DEFAULT_STREAM_TYPE</code> is not a valid value
-     *     for {@link AudioManager#setStreamVolume(int, int, int)}.
-     * @deprecated use {@link #getVolumeControlStream()}
-     */
-    public static int getVolumeControlStream(@NonNull AudioAttributes aa) {
-        if (aa == null) {
-            throw new IllegalArgumentException("Invalid null audio attributes");
-        }
-        return toVolumeStreamType(true /*fromGetVolumeControlStream*/, aa);
-    }
-
     /**
      * Returns the stream type matching this {@code AudioAttributes} instance for volume control.
      * Use this method to derive the stream type needed to configure the volume