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

Commit 614423b2 authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Make ctor of MediaMetdata.Builder as @SystemApi"

parents aa9a577c c4ecd1d7

api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ package android.media { 
    field public static final int FLAG_FROM_KEY = 4096; // 0x1000

  }



  public static final class MediaMetadata.Builder {

    ctor public MediaMetadata.Builder(@NonNull android.media.MediaMetadata, @IntRange(from=1) int);

  }



}



package android.media.session {

media/java/android/media/MediaMetadata.java

+6 −3
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
 */

package android.media;



import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.StringDef;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ContentResolver;

import android.graphics.Bitmap;
@@ -738,15 +740,16 @@ public final class MediaMetadata implements Parcelable { 


        /**

         * Create a Builder using a {@link MediaMetadata} instance to set

         * initial values, but replace bitmaps with a scaled down copy if they

         * are larger than maxBitmapSize.

         * initial values, but replace bitmaps with a scaled down copy if their width (or height)

         * is larger than maxBitmapSize.

         *

         * @param source The original metadata to copy.

         * @param maxBitmapSize The maximum height/width for bitmaps contained

         *            in the metadata.

         * @hide

         */

        public Builder(MediaMetadata source, int maxBitmapSize) {

        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

        public Builder(@NonNull MediaMetadata source, @IntRange(from = 1) int maxBitmapSize) {

            this(source);

            for (String key : mBundle.keySet()) {

                Object value = mBundle.get(key);

non-updatable-api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ package android.media { 
    field public static final int FLAG_FROM_KEY = 4096; // 0x1000

  }



  public static final class MediaMetadata.Builder {

    ctor public MediaMetadata.Builder(@NonNull android.media.MediaMetadata, @IntRange(from=1) int);

  }



}



package android.media.session {