From 38696ba77d7f614cb50672aaca99f7ba59b56126 Mon Sep 17 00:00:00 2001
From: RoboErik <epastern@google.com>
Date: Mon, 20 Oct 2014 09:48:13 -0700
Subject: [PATCH] Set the metadata rating correctly in RCC

We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.

bug:18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
---
 media/java/android/media/RemoteControlClient.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index 0336f11fae0f7..1b6536faed26a 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)}).