diff options
author | RoboErik <epastern@google.com> | 2014-10-20 19:07:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-20 19:07:52 +0000 |
commit | 578fbe898f1652b3166bd4e20647572dec9dfb14 (patch) | |
tree | 907c3da6745a867e05e1ad005e08f2ad18b2608a | |
parent | 00831836cdeeb4a61ba10c724c3ca33280937b62 (diff) | |
parent | 38696ba77d7f614cb50672aaca99f7ba59b56126 (diff) | |
download | base-578fbe898f1652b3166bd4e20647572dec9dfb14.tar.gz |
Merge "Set the metadata rating correctly in RCC" into lmp-dev
-rw-r--r-- | media/java/android/media/RemoteControlClient.java | 15 |
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)}). |