diff --git a/media/java/android/media/MediaMetadataEditor.java b/media/java/android/media/MediaMetadataEditor.java
index b601016ae5d81..373ba11a7c3e9 100644
--- a/media/java/android/media/MediaMetadataEditor.java
+++ b/media/java/android/media/MediaMetadataEditor.java
@@ -273,7 +273,7 @@ public abstract class MediaMetadataEditor {
      *     <li>{@link Rating} object are {@link #RATING_KEY_BY_OTHERS}
      *         and {@link #RATING_KEY_BY_USER}.</li>
      *     </ul>
-     * @param obj the metadata to add.
+     * @param value the metadata to add.
      * @return Returns a reference to the same MediaMetadataEditor object, so you can chain put
      *      calls together.
      * @throws IllegalArgumentException
diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index 4b5a1cac62896..7613c890dc611 100644
--- a/media/java/android/media/RemoteControlClient.java
+++ b/media/java/android/media/RemoteControlClient.java
@@ -298,8 +298,8 @@ public class RemoteControlClient
      * Flag indicating a RemoteControlClient supports ratings.
      * This flag must be set in order for components that display the RemoteControlClient
      * information, to display ratings information, and, if ratings are declared editable
-     * (by calling {@link MetadataEditor#addEditableKey(int)} with the
-     * {@link MetadataEditor#LONG_KEY_RATING_BY_USER} key), it will enable the user to rate
+     * (by calling {@link MediaMetadataEditor#addEditableKey(int)} with the
+     * {@link MediaMetadataEditor#RATING_KEY_BY_USER} key), it will enable the user to rate
      * the media, with values being received through the interface set with
      * {@link #setMetadataUpdateListener(OnMetadataUpdateListener)}.
      * @see #setTransportControlFlags(int)