diff options
| author | RoboErik <epastern@google.com> | 2014-10-20 19:20:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 19:20:32 +0000 |
| commit | d00e68c3b6a4c727bd59a7e7c4524fb3fdd193f0 (patch) | |
| tree | eafedf25f2028eafd52f10620ecc3bb776c16b8a /media | |
| parent | e28cd1a276d64d697da89cac4941baf79f380f6c (diff) | |
| parent | 26a4309492f5af6828738a469ad8f18f42c44a61 (diff) | |
| download | frameworks_base-d00e68c3b6a4c727bd59a7e7c4524fb3fdd193f0.zip frameworks_base-d00e68c3b6a4c727bd59a7e7c4524fb3fdd193f0.tar.gz frameworks_base-d00e68c3b6a4c727bd59a7e7c4524fb3fdd193f0.tar.bz2 | |
am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
* commit '26a4309492f5af6828738a469ad8f18f42c44a61':
Set the metadata rating correctly in RCC
Diffstat (limited to 'media')
| -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 0336f11..1b6536f 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)}). |