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

Commit bf38c753 authored by Jaewan Kim's avatar Jaewan Kim
Browse files

MediaSession2: Move MediaItem2 to updatable 

Bug: 72627815
Test: Run all MediaComponents test once
Change-Id: I4359fb64457d78642664d5d223b264d4565bbd30
parent bf960686

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

0 → 100644
+163 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.media;



import static android.media.MediaItem2.FLAG_BROWSABLE;

import static android.media.MediaItem2.FLAG_PLAYABLE;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.media.DataSourceDesc;

import android.media.MediaItem2;

import android.media.MediaItem2.Flags;

import android.media.MediaMetadata2;

import android.media.update.MediaItem2Provider;

import android.os.Bundle;

import android.text.TextUtils;



public class MediaItem2Impl implements MediaItem2Provider {

    private static final String KEY_ID = "android.media.mediaitem2.id";

    private static final String KEY_FLAGS = "android.media.mediaitem2.flags";

    private static final String KEY_METADATA = "android.media.mediaitem2.metadata";



    private final Context mContext;

    private final MediaItem2 mInstance;

    private final String mId;

    private final int mFlags;

    private MediaMetadata2 mMetadata;

    private DataSourceDesc mDataSourceDesc;



    // From the public API

    public MediaItem2Impl(Context context, MediaItem2 instance, String mediaId,

            DataSourceDesc dsd, 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 match with the mediaid");

        }



        mContext = context;

        mInstance = instance;



        mId = mediaId;

        mDataSourceDesc = dsd;

        mMetadata = metadata;

        mFlags = flags;

    }



    // Create anonymized version

    public MediaItem2Impl(Context context, String mediaId, MediaMetadata2 metadata,

            @Flags int flags) {

        if (mediaId == null) {

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

        }

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

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

        }

        mContext =context;

        mId = mediaId;

        mMetadata = metadata;

        mFlags = flags;

        mInstance = new MediaItem2(this);

    }



    /**

     * Return this object as a bundle to share between processes.

     *

     * @return a new bundle instance

     */

    public Bundle toBundle_impl() {

        Bundle bundle = new Bundle();

        bundle.putString(KEY_ID, mId);

        bundle.putInt(KEY_FLAGS, mFlags);

        if (mMetadata != null) {

            bundle.putBundle(KEY_METADATA, mMetadata.getBundle());

        }

        return bundle;

    }



    public static MediaItem2 fromBundle(Context context, Bundle bundle) {

        if (bundle == null) {

            return null;

        }

        final String id = bundle.getString(KEY_ID);

        final Bundle metadataBundle = bundle.getBundle(KEY_METADATA);

        final MediaMetadata2 metadata = metadataBundle != null

                ? new MediaMetadata2(metadataBundle) : null;

        final int flags = bundle.getInt(KEY_FLAGS);

        return new MediaItem2Impl(context, id, metadata, flags).getInstance();

    }



    private MediaItem2 getInstance() {

        return mInstance;

    }



    @Override

    public String toString_impl() {

        final StringBuilder sb = new StringBuilder("MediaItem2{");

        sb.append("mFlags=").append(mFlags);

        sb.append(", mMetadata=").append(mMetadata);

        sb.append('}');

        return sb.toString();

    }



    @Override

    public @Flags int getFlags_impl() {

        return mFlags;

    }



    @Override

    public boolean isBrowsable_impl() {

        return (mFlags & FLAG_BROWSABLE) != 0;

    }



    @Override

    public boolean isPlayable_impl() {

        return (mFlags & FLAG_PLAYABLE) != 0;

    }



    @Override

    public void setMetadata_impl(@NonNull MediaMetadata2 metadata) {

        if (metadata == null) {

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

        }

        if (TextUtils.isEmpty(metadata.getMediaId())) {

            throw new IllegalArgumentException("metadata must have a non-empty media id");

        }

        mMetadata = metadata;

    }



    @Override

    public MediaMetadata2 getMetadata_impl() {

        return mMetadata;

    }



    @Override

    public @Nullable String getMediaId_impl() {

        return mMetadata.getMediaId();

    }



    @Override

    public @Nullable DataSourceDesc getDataSourceDesc_impl() {

        return mDataSourceDesc;

    }

}

packages/MediaComponents/src/com/android/media/update/ApiFactory.java

+16 −0
Original line number Diff line number Diff line
@@ -20,14 +20,17 @@ import android.app.PendingIntent; 
import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.media.DataSourceDesc;

import android.media.IMediaSession2;

import android.media.MediaBrowser2;

import android.media.MediaBrowser2.BrowserCallback;

import android.media.MediaController2;

import android.media.MediaController2.ControllerCallback;

import android.media.MediaItem2;

import android.media.MediaLibraryService2;

import android.media.MediaLibraryService2.MediaLibrarySession;

import android.media.MediaLibraryService2.MediaLibrarySessionCallback;

import android.media.MediaMetadata2;

import android.media.MediaPlayerInterface;

import android.media.MediaSession2;

import android.media.MediaSession2.ControllerInfo;
@@ -40,6 +43,7 @@ import android.media.VolumeProvider; 
import android.media.update.MediaBrowser2Provider;

import android.media.update.MediaControlView2Provider;

import android.media.update.MediaController2Provider;

import android.media.update.MediaItem2Provider;

import android.media.update.MediaLibraryService2Provider.MediaLibrarySessionProvider;

import android.media.update.MediaSession2Provider;

import android.media.update.MediaSessionService2Provider;
@@ -57,6 +61,7 @@ import android.widget.VideoView2; 


import com.android.media.MediaBrowser2Impl;

import com.android.media.MediaController2Impl;

import com.android.media.MediaItem2Impl;

import com.android.media.MediaLibraryService2Impl;

import com.android.media.MediaLibraryService2Impl.MediaLibrarySessionImpl;

import com.android.media.MediaSession2Impl;
@@ -156,4 +161,15 @@ public class ApiFactory implements StaticProvider { 
        // TODO(jaewan): Implement this

        return null;

    }



    @Override

    public MediaItem2Provider createMediaItem2Provider(Context context, MediaItem2 instance,

            String mediaId, DataSourceDesc dsd, MediaMetadata2 metadata, int flags) {

        return new MediaItem2Impl(context, instance, mediaId, dsd, metadata, flags);

    }



    @Override

    public MediaItem2 fromBundle_MediaItem2(Context context, Bundle bundle) {

        return MediaItem2Impl.fromBundle(context, bundle);

    }

}