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

Commit 8dd90ec5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaSession2: Make PlaybackInfoProvider inner interface"

parents 035d8af1 7d550e73

media/java/android/media/MediaController2.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import android.media.MediaSession2.PlaylistParams; 
import android.media.session.MediaSessionManager;

import android.media.update.ApiLoader;

import android.media.update.MediaController2Provider;

import android.media.update.PlaybackInfoProvider;

import android.media.update.MediaController2Provider.PlaybackInfoProvider;

import android.net.Uri;

import android.os.Bundle;

import android.os.ResultReceiver;

media/java/android/media/update/MediaController2Provider.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.media.update; 


import android.annotation.SystemApi;

import android.app.PendingIntent;

import android.media.AudioAttributes;

import android.media.MediaController2.PlaybackInfo;

import android.media.MediaItem2;

import android.media.MediaSession2.Command;
@@ -65,4 +66,12 @@ public interface MediaController2Provider extends TransportControlProvider { 
    PlaylistParams getPlaylistParams_impl();

    void setPlaylistParams_impl(PlaylistParams params);

    PlaybackState2 getPlaybackState_impl();



    interface PlaybackInfoProvider {

        int getPlaybackType_impl();

        AudioAttributes getAudioAttributes_impl();

        int getControlType_impl();

        int getMaxVolume_impl();

        int getCurrentVolume_impl();

    }

}

media/java/android/media/update/PlaybackInfoProvider.java

deleted100644 → 0
+0 −31
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 android.media.update;



import android.media.AudioAttributes;



/**

 * @hide

 */

// TODO(jaewan): @SystemApi

public interface PlaybackInfoProvider {

    int getPlaybackType_impl();

    AudioAttributes getAudioAttributes_impl();

    int getControlType_impl();

    int getMaxVolume_impl();

    int getCurrentVolume_impl();

}