Merge "Set the metadata rating correctly in RCC" into lmp-dev

1 files changed, 15 insertions, 0 deletions

diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index 0336f11fae0f..1b6536faed26 100644
--- a/media/java/android/media/RemoteControlClient.java
+++ b/media/java/android/media/RemoteControlClient.java
@@ -535,6 +535,21 @@ import java.lang.IllegalArgumentException;
             return this;
         }
 
+        @Override
+        public synchronized MetadataEditor putObject(int key, Object object)
+                throws IllegalArgumentException {
+            super.putObject(key, object);
+            if (mMetadataBuilder != null &&
+                    (key == MediaMetadataEditor.RATING_KEY_BY_USER ||
+                    key == MediaMetadataEditor.RATING_KEY_BY_OTHERS)) {
+                String metadataKey = MediaMetadata.getKeyFromMetadataEditorKey(key);
+                if (metadataKey != null) {
+                    mMetadataBuilder.putRating(metadataKey, (Rating) object);
+                }
+            }
+            return this;
+        }
+
         /**
          * Clears all the metadata that has been set since the MetadataEditor instance was created
          * (with {@link RemoteControlClient#editMetadata(boolean)}).