Revert "limit MediaMetadata object size to avoid Binder failures"

This reverts commit 1c05ff2.

Author: thestinger

media/java/android/media/MediaMetadata.java

@@ -767,30 +767,8 @@ public Builder() {
          * @param source
          */
         public Builder(MediaMetadata source) {
-            mBundle = new Bundle();
+            mBundle = new Bundle(source.mBundle);
             mBitmapDimensionLimit = source.mBitmapDimensionLimit;
-            for (String key : source.mBundle.keySet()) {
-                // there is no non-deprecated way for doing this AFAIK
-                //noinspection deprecation
-                Object value = source.mBundle.get(key);
-                if (value == null) {
-                    Log.w(TAG, "Builder: discarding key with null value: " + key);
-                    continue;
-                }
-                if (value instanceof String s) {
-                    putString(key, s);
-                } else if (value instanceof CharSequence cs) {
-                    putText(key, cs);
-                } else if (value instanceof Long l) {
-                    putLong(key, l.longValue());
-                } else if (value instanceof Rating r) {
-                    putRating(key, r);
-                } else if (value instanceof Bitmap bm) {
-                    putBitmap(key, bm);
-                } else {
-                    throw new IllegalStateException("unexpected value type: " + value.getClass());
-                }
-            }
         }
 
         /**
@@ -827,7 +805,6 @@ public Builder putText(@TextKey String key, CharSequence value) {
                 }
             }
             mBundle.putCharSequence(key, value);
-            removeIfTooLarge(key);
             return this;
         }
 
@@ -870,7 +847,6 @@ public Builder putString(@TextKey String key, String value) {
                 }
             }
             mBundle.putCharSequence(key, value);
-            removeIfTooLarge(key);
             return this;
         }
 
@@ -898,7 +874,6 @@ public Builder putLong(@LongKey String key, long value) {
                 }
             }
             mBundle.putLong(key, value);
-            removeIfTooLarge(key);
             return this;
         }
 
@@ -923,7 +898,6 @@ public Builder putRating(@RatingKey String key, Rating value) {
                 }
             }
             mBundle.putParcelable(key, value);
-            removeIfTooLarge(key);
             return this;
         }
 
@@ -953,8 +927,7 @@ public Builder putBitmap(@BitmapKey String key, Bitmap value) {
                             + " key cannot be used to put a Bitmap");
                 }
             }
-            mBundle.putParcelable(key, prepareBitmap(value, key));
-            removeIfTooLarge(key);
+            mBundle.putParcelable(key, value);
             return this;
         }
 
@@ -991,44 +964,21 @@ public MediaMetadata build() {
                 for (String key : mBundle.keySet()) {
                     Object value = mBundle.get(key);
                     if (value instanceof Bitmap bmp) {
-                        Bitmap preparedBmp = prepareBitmap(bmp, key);
-                        if (preparedBmp != bmp) {
-                            putBitmap(key, preparedBmp);
+                        final Bitmap orig = bmp;
+                        if (bmp.getHeight() > mBitmapDimensionLimit
+                                || bmp.getWidth() > mBitmapDimensionLimit) {
+                            bmp = scaleBitmap(bmp, mBitmapDimensionLimit);
+                        }
+                        Bitmap sharedBmp = bmp.asShared();
+                        if (orig != sharedBmp) {
+                            putBitmap(key, sharedBmp);
                         }
                     }
                 }
             }
             return new MediaMetadata(mBundle, mBitmapDimensionLimit);
         }
 
-        private void removeIfTooLarge(String key) {
-            Parcel parcel = Parcel.obtain();
-            try {
-                mBundle.writeToParcel(parcel, 0);
-                if (parcel.dataSize() > 500 * 1024) {
-                    Log.e(TAG, "Builder: bundle ran out of space, dropping " + key);
-                    mBundle.remove(key);
-                }
-            } finally {
-                parcel.recycle();
-            }
-        }
-
-        private Bitmap prepareBitmap(Bitmap bmp, String key) {
-            int origW = bmp.getWidth();
-            int origH = bmp.getHeight();
-            if (origW > mBitmapDimensionLimit || origH > mBitmapDimensionLimit) {
-                bmp = scaleBitmap(bmp, mBitmapDimensionLimit);
-                Log.d(TAG, "resized bitmap " + key + " from " + origW + "x" + origH
-                        + " to " + bmp.getWidth() + "x" + bmp.getHeight());
-            }
-            Bitmap shared = bmp.asShared();
-            if (bmp != shared) {
-                Log.d(TAG, "converted bitmap " + key + " to a shared bitmap");
-            }
-            return shared;
-        }
-
         private Bitmap scaleBitmap(Bitmap bmp, int maxDimension) {
             float maxDimensionF = maxDimension;
             float widthScale = maxDimensionF / bmp.getWidth();