diff options
| -rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 1 | ||||
| -rw-r--r-- | media/java/android/media/RemoteControlClient.java | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 4c83e5568725..db0c94f01f26 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -692,6 +692,7 @@ public class VectorDrawable extends Drawable { if (mTempPaint == null) { mTempPaint = new Paint(); + mTempPaint.setFilterBitmap(true); } mTempPaint.setAlpha(mVPathRenderer.getRootAlpha()); mTempPaint.setColorFilter(filter); 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)}). |