Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d4ab44 authored by Oliver Woodman's avatar Oliver Woodman Committed by Automerger Merge Worker
Browse files

Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am:... 

Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am: 1574fbe5 am: fbb13d7b am: 2a66534e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918926



Change-Id: I9956c98274ee3e7560e397b06b14db200af096ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea94471c 2a66534e

media/java/android/media/MediaMetadata.java

+9 −0
Original line number Diff line number Diff line
@@ -429,6 +429,15 @@ public final class MediaMetadata implements Parcelable { 
    private MediaMetadata(Parcel in) {

        mBundle = in.readBundle();

        mBitmapDimensionLimit = Math.max(in.readInt(), 1);



        // Proactively read bitmaps from known bitmap keys, to ensure that they're unparceled and

        // added to mBundle's internal map. This ensures that the GC accounts for the underlying

        // allocations, which it does not do if the bitmaps remain parceled (see b/215820910).

        // TODO(b/223225532): Remove this workaround once the underlying allocations are properly

        // tracked in NativeAllocationsRegistry.

        getBitmap(METADATA_KEY_ART);

        getBitmap(METADATA_KEY_ALBUM_ART);

        getBitmap(METADATA_KEY_DISPLAY_ICON);

    }



    /**