diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java
index 2cca669a592be..00a4c7e19f34d 100644
--- a/media/java/android/media/AudioDeviceInfo.java
+++ b/media/java/android/media/AudioDeviceInfo.java
@@ -448,8 +448,7 @@ public final class AudioDeviceInfo {
      * Returns an array of supported encapsulation modes for the device.
      *
      * The array can include any of the {@code AudioTrack} encapsulation modes,
-     * e.g. {@link AudioTrack#ENCAPSULATION_MODE_NONE},
-     * or {@link AudioTrack#ENCAPSULATION_MODE_ELEMENTARY_STREAM}.
+     * e.g. {@link AudioTrack#ENCAPSULATION_MODE_ELEMENTARY_STREAM}.
      *
      * @return An array of supported encapsulation modes for the device.  This
      *     may be an empty array if no encapsulation modes are supported.
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 9f3fc5d94a989..1c0a526f536c8 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -280,7 +280,7 @@ public class AudioTrack extends PlayerBase
     /**
      * Encapsulation metadata type for framework tuner information.
      *
-     * TODO(b/147778408) Link: Fill in Tuner API info.
+     * Refer to the Android Media TV Tuner API for details.
      */
     public static final int ENCAPSULATION_METADATA_TYPE_FRAMEWORK_TUNER = 1;