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

Merge "Added MediaDescription#getMediaUri."

Browse Source
This commit is contained in:
P.Y. Laligand
2015-03-25 23:19:30 +00:00
committed by Android (Google) Code Review
parent c14b733f62 6fbcc2c01b
commit c40e64a412
3 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -15231,6 +15231,7 @@ package android.media {
method public android.graphics.Bitmap getIconBitmap();
method public android.net.Uri getIconUri();
method public java.lang.String getMediaId();
method public android.net.Uri getMediaUri();
method public java.lang.CharSequence getSubtitle();
method public java.lang.CharSequence getTitle();
method public void writeToParcel(android.os.Parcel, int);
@@ -15245,6 +15246,7 @@ package android.media {
method public android.media.MediaDescription.Builder setIconBitmap(android.graphics.Bitmap);
method public android.media.MediaDescription.Builder setIconUri(android.net.Uri);
method public android.media.MediaDescription.Builder setMediaId(java.lang.String);
method public android.media.MediaDescription.Builder setMediaUri(android.net.Uri);
method public android.media.MediaDescription.Builder setSubtitle(java.lang.CharSequence);
method public android.media.MediaDescription.Builder setTitle(java.lang.CharSequence);
}

2
api/system-current.txt
View File

@@ -16429,6 +16429,7 @@ package android.media {
method public android.graphics.Bitmap getIconBitmap();
method public android.net.Uri getIconUri();
method public java.lang.String getMediaId();
method public android.net.Uri getMediaUri();
method public java.lang.CharSequence getSubtitle();
method public java.lang.CharSequence getTitle();
method public void writeToParcel(android.os.Parcel, int);
@@ -16443,6 +16444,7 @@ package android.media {
method public android.media.MediaDescription.Builder setIconBitmap(android.graphics.Bitmap);
method public android.media.MediaDescription.Builder setIconUri(android.net.Uri);
method public android.media.MediaDescription.Builder setMediaId(java.lang.String);
method public android.media.MediaDescription.Builder setMediaUri(android.net.Uri);
method public android.media.MediaDescription.Builder setSubtitle(java.lang.CharSequence);
method public android.media.MediaDescription.Builder setTitle(java.lang.CharSequence);
}

32
media/java/android/media/MediaDescription.java
View File

@@ -41,9 +41,13 @@ public class MediaDescription implements Parcelable {
* Extras for opaque use by apps/system.
*/
private final Bundle mExtras;
/**
* A Uri to identify this content.
*/
private final Uri mMediaUri;
private MediaDescription(String mediaId, CharSequence title, CharSequence subtitle,
CharSequence description, Bitmap icon, Uri iconUri, Bundle extras) {
CharSequence description, Bitmap icon, Uri iconUri, Bundle extras, Uri mediaUri) {
mMediaId = mediaId;
mTitle = title;
mSubtitle = subtitle;
@@ -51,6 +55,7 @@ public class MediaDescription implements Parcelable {
mIcon = icon;
mIconUri = iconUri;
mExtras = extras;
mMediaUri = mediaUri;
}
private MediaDescription(Parcel in) {
@@ -61,6 +66,7 @@ public class MediaDescription implements Parcelable {
mIcon = in.readParcelable(null);
mIconUri = in.readParcelable(null);
mExtras = in.readBundle();
mMediaUri = in.readParcelable(null);
}
/**
@@ -125,6 +131,15 @@ public class MediaDescription implements Parcelable {
return mExtras;
}
/**
* Returns a Uri representing this content or null.
*
* @return A media Uri or null.
*/
public @Nullable Uri getMediaUri() {
return mMediaUri;
}
@Override
public int describeContents() {
return 0;
@@ -139,6 +154,7 @@ public class MediaDescription implements Parcelable {
dest.writeParcelable(mIcon, flags);
dest.writeParcelable(mIconUri, flags);
dest.writeBundle(mExtras);
dest.writeParcelable(mMediaUri, flags);
}
@Override
@@ -170,6 +186,7 @@ public class MediaDescription implements Parcelable {
private Bitmap mIcon;
private Uri mIconUri;
private Bundle mExtras;
private Uri mMediaUri;
/**
* Creates an initially empty builder.
@@ -257,9 +274,20 @@ public class MediaDescription implements Parcelable {
return this;
}
/**
* Sets the media uri.
*
* @param mediaUri The content's {@link Uri} for the item or null.
* @return this
*/
public Builder setMediaUri(@Nullable Uri mediaUri) {
mMediaUri = mediaUri;
return this;
}
public MediaDescription build() {
return new MediaDescription(mMediaId, mTitle, mSubtitle, mDescription, mIcon, mIconUri,
mExtras);
mExtras, mMediaUri);
}
}
}