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

Commit faf8e7d3 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

MediaSession2: Add onDataSourceMissingHelper am: ee19f10e 

am: ef201fb5

Change-Id: I403f6d2c88ade4d786f13548cdce43681effb4d6
parents 1a238421 ef201fb5

packages/MediaComponents/src/com/android/media/MediaItem2Impl.java

+3 −9
Original line number Diff line number Diff line
@@ -44,14 +44,11 @@ public class MediaItem2Impl implements MediaItem2Provider { 
    private DataSourceDesc mDataSourceDesc;



    // From the public API

    public MediaItem2Impl(Context context, String mediaId,

            DataSourceDesc dsd, MediaMetadata2 metadata, @Flags int flags) {

    public MediaItem2Impl(@NonNull Context context, @NonNull String mediaId,

            @Nullable DataSourceDesc dsd, @Nullable MediaMetadata2 metadata, @Flags int flags) {

        if (mediaId == null) {

            throw new IllegalArgumentException("mediaId shouldn't be null");

        }

        if (dsd == null) {

            throw new IllegalArgumentException("dsd shouldn't be null");

        }

        if (metadata != null && !TextUtils.equals(mediaId, metadata.getMediaId())) {

            throw new IllegalArgumentException("metadata's id should be matched with the mediaid");

        }
@@ -186,10 +183,7 @@ public class MediaItem2Impl implements MediaItem2Provider { 
        }



        @Override

        public Builder setDataSourceDesc_impl(@NonNull DataSourceDesc dataSourceDesc) {

            if (dataSourceDesc == null) {

                throw new IllegalArgumentException("dataSourceDesc shouldn't be null");

            }

        public Builder setDataSourceDesc_impl(@Nullable DataSourceDesc dataSourceDesc) {

            mDataSourceDesc = dataSourceDesc;

            return mInstance;

        }