Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hyundo Moon
2020-09-09 04:21:57 +00:00
committed by Android (Google) Code Review
parent aa9a577c35 c4ecd1d7cc
commit 614423b2c1
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/module-lib-current.txt
View File

@@ -41,6 +41,10 @@ package android.media {
field public static final int FLAG_FROM_KEY = 4096; // 0x1000 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 { package android.media.session {

9
media/java/android/media/MediaMetadata.java
View File

@@ -15,8 +15,10 @@
*/ */
package android.media; package android.media;
import android.annotation.IntRange;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.StringDef; import android.annotation.StringDef;
import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -738,15 +740,16 @@ public final class MediaMetadata implements Parcelable {
/** /**
* Create a Builder using a {@link MediaMetadata} instance to set * Create a Builder using a {@link MediaMetadata} instance to set
* initial values, but replace bitmaps with a scaled down copy if they * initial values, but replace bitmaps with a scaled down copy if their width (or height)
* are larger than maxBitmapSize. * is larger than maxBitmapSize.
* *
* @param source The original metadata to copy. * @param source The original metadata to copy.
* @param maxBitmapSize The maximum height/width for bitmaps contained * @param maxBitmapSize The maximum height/width for bitmaps contained
* in the metadata. * in the metadata.
* @hide * @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); this(source);
for (String key : mBundle.keySet()) { for (String key : mBundle.keySet()) {
Object value = mBundle.get(key); Object value = mBundle.get(key);

4
non-updatable-api/module-lib-current.txt
View File

@@ -41,6 +41,10 @@ package android.media {
field public static final int FLAG_FROM_KEY = 4096; // 0x1000 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 { package android.media.session {