Merge "Avoid throwing on invalid extras Bundles" into androidx-main
diff --git a/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java b/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java
index d3653f5..1a4f88e 100644
--- a/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java
+++ b/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java
@@ -393,8 +393,9 @@
bob.setIconBitmap(Api21Impl.getIconBitmap(description));
bob.setIconUri(Api21Impl.getIconUri(description));
Bundle extras = Api21Impl.getExtras(description);
+ extras = MediaSessionCompat.unparcelWithClassLoader(extras);
if (extras != null) {
- extras = new Bundle(MediaSessionCompat.unparcelWithClassLoader(extras));
+ extras = new Bundle(extras);
}
Uri mediaUri = null;
if (extras != null) {
