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

Commit 17b090a8 authored by Joseph Pirozzo's avatar Joseph Pirozzo
Browse files

AVRCP Controller Shuffle/Repeat support 

Add Custom actions to the Playback status for Shuffle and Repeat
capabilities when available from the remote device.

Bug: 72495707
Test: AvrcpControllerStateMachineTest#testShuffle
      AvrcpControllerStateMachineTest#testRepeat
	Change Shuffle and Repeat mode on connected phone via Headunit
Change-Id: Ia0a62d10032b6e918a38e66bd486a29199b772e2
parent c182d77f

android/app/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 


LOCAL_STATIC_ANDROID_LIBRARIES := \

        androidx.core_core \

        androidx.legacy_legacy-support-v4 \

        androidx.lifecycle_lifecycle-livedata \

        androidx.room_room-runtime \

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java

+18 −15
Original line number Diff line number Diff line
@@ -412,9 +412,10 @@ public class AvrcpControllerService extends ProfileService { 
        if (stateMachine != null) {

            PlayerApplicationSettings supportedSettings =

                    PlayerApplicationSettings.makeSupportedSettings(playerAttribRsp);

            stateMachine.sendMessage(

                    AvrcpControllerStateMachine.MESSAGE_PROCESS_SUPPORTED_APPLICATION_SETTINGS,

                    supportedSettings);

        }

        /* Do nothing */



    }



    private synchronized void onPlayerAppSettingChanged(byte[] address, byte[] playerAttribRsp,
@@ -426,10 +427,12 @@ public class AvrcpControllerService extends ProfileService { 
        AvrcpControllerStateMachine stateMachine = getStateMachine(device);

        if (stateMachine != null) {



            PlayerApplicationSettings desiredSettings =

            PlayerApplicationSettings currentSettings =

                    PlayerApplicationSettings.makeSettings(playerAttribRsp);

            stateMachine.sendMessage(

                    AvrcpControllerStateMachine.MESSAGE_PROCESS_CURRENT_APPLICATION_SETTINGS,

                    currentSettings);

        }

        /* Do nothing */

    }



    // Browsing related JNI callbacks.

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+63 −11
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ import android.content.Intent; 
import android.media.AudioManager;

import android.media.MediaMetadata;

import android.media.browse.MediaBrowser.MediaItem;

import android.media.session.MediaSession;

import android.media.session.PlaybackState;

import android.os.Bundle;

import android.os.Message;

import android.support.v4.media.session.MediaSessionCompat;

import android.support.v4.media.session.PlaybackStateCompat;

import android.util.Log;

import android.util.SparseArray;
@@ -42,6 +42,7 @@ import com.android.internal.util.StateMachine; 


import java.util.ArrayList;

import java.util.List;



/**

 * Provides Bluetooth AVRCP Controller State Machine responsible for all remote control connections

 * and interactions with a remote controlable device.
@@ -76,11 +77,15 @@ class AvrcpControllerStateMachine extends StateMachine { 
    static final int MESSAGE_PROCESS_SET_ADDRESSED_PLAYER = 214;

    static final int MESSAGE_PROCESS_ADDRESSED_PLAYER_CHANGED = 215;

    static final int MESSAGE_PROCESS_NOW_PLAYING_CONTENTS_CHANGED = 216;

    static final int MESSAGE_PROCESS_SUPPORTED_APPLICATION_SETTINGS = 217;

    static final int MESSAGE_PROCESS_CURRENT_APPLICATION_SETTINGS = 218;



    //300->399 Events for Browsing

    static final int MESSAGE_GET_FOLDER_ITEMS = 300;

    static final int MESSAGE_PLAY_ITEM = 301;

    static final int MSG_AVRCP_PASSTHRU = 302;

    static final int MSG_AVRCP_SET_SHUFFLE = 303;

    static final int MSG_AVRCP_SET_REPEAT = 304;



    static final int MESSAGE_INTERNAL_ABS_VOL_TIMEOUT = 404;
@@ -215,12 +220,12 @@ class AvrcpControllerStateMachine extends StateMachine { 


    synchronized void onBrowsingDisconnected() {

        if (!mBrowsingConnected) return;

        mAddressedPlayer.setPlayStatus(PlaybackState.STATE_ERROR);

        mAddressedPlayer.setPlayStatus(PlaybackStateCompat.STATE_ERROR);

        mAddressedPlayer.updateCurrentTrack(null);

        mBrowseTree.mNowPlayingNode.setCached(false);

        BluetoothMediaBrowserService.notifyChanged(mBrowseTree.mNowPlayingNode);

        PlaybackState.Builder pbb = new PlaybackState.Builder();

        pbb.setState(PlaybackState.STATE_ERROR, PlaybackState.PLAYBACK_POSITION_UNKNOWN,

        PlaybackStateCompat.Builder pbb = new PlaybackStateCompat.Builder();

        pbb.setState(PlaybackStateCompat.STATE_ERROR, PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN,

                1.0f).setActions(0);

        pbb.setErrorMessage(mService.getString(R.string.bluetooth_disconnected));

        BluetoothMediaBrowserService.notifyChanged(pbb.build());
@@ -322,6 +327,14 @@ class AvrcpControllerStateMachine extends StateMachine { 
                    passThru(msg.arg1);

                    return true;



                case MSG_AVRCP_SET_REPEAT:

                    setRepeat(msg.arg1);

                    return true;



                case MSG_AVRCP_SET_SHUFFLE:

                    setShuffle(msg.arg1);

                    return true;



                case MESSAGE_PROCESS_TRACK_CHANGED:

                    mAddressedPlayer.updateCurrentTrack((MediaMetadata) msg.obj);

                    BluetoothMediaBrowserService.trackChanged((MediaMetadata) msg.obj);
@@ -331,7 +344,7 @@ class AvrcpControllerStateMachine extends StateMachine { 
                    mAddressedPlayer.setPlayStatus(msg.arg1);

                    BluetoothMediaBrowserService.notifyChanged(mAddressedPlayer.getPlaybackState());

                    if (mAddressedPlayer.getPlaybackState().getState()

                            == PlaybackState.STATE_PLAYING

                            == PlaybackStateCompat.STATE_PLAYING

                            && A2dpSinkService.getFocusState() == AudioManager.AUDIOFOCUS_NONE

                            && !shouldRequestFocus()) {

                        sendMessage(MSG_AVRCP_PASSTHRU,
@@ -362,6 +375,18 @@ class AvrcpControllerStateMachine extends StateMachine { 
                    }

                    return true;



                case MESSAGE_PROCESS_SUPPORTED_APPLICATION_SETTINGS:

                    mAddressedPlayer.setSupportedPlayerApplicationSettings(

                            (PlayerApplicationSettings) msg.obj);

                    BluetoothMediaBrowserService.notifyChanged(mAddressedPlayer.getPlaybackState());

                    return true;



                case MESSAGE_PROCESS_CURRENT_APPLICATION_SETTINGS:

                    mAddressedPlayer.setCurrentPlayerApplicationSettings(

                            (PlayerApplicationSettings) msg.obj);

                    BluetoothMediaBrowserService.notifyChanged(mAddressedPlayer.getPlaybackState());

                    return true;



                case DISCONNECT:

                    transitionTo(mDisconnecting);

                    return true;
@@ -419,6 +444,20 @@ class AvrcpControllerStateMachine extends StateMachine { 
            return (cmd == AvrcpControllerService.PASS_THRU_CMD_ID_REWIND)

                    || (cmd == AvrcpControllerService.PASS_THRU_CMD_ID_FF);

        }



        private void setRepeat(int repeatMode) {

            mService.setPlayerApplicationSettingValuesNative(mDeviceAddress, (byte) 1,

                    new byte[]{PlayerApplicationSettings.REPEAT_STATUS}, new byte[]{

                            PlayerApplicationSettings.mapAvrcpPlayerSettingstoBTattribVal(

                                    PlayerApplicationSettings.REPEAT_STATUS, repeatMode)});

        }



        private void setShuffle(int shuffleMode) {

            mService.setPlayerApplicationSettingValuesNative(mDeviceAddress, (byte) 1,

                    new byte[]{PlayerApplicationSettings.SHUFFLE_STATUS}, new byte[]{

                            PlayerApplicationSettings.mapAvrcpPlayerSettingstoBTattribVal(

                                    PlayerApplicationSettings.SHUFFLE_STATUS, shuffleMode)});

        }

    }



    // Handle the get folder listing action
@@ -697,7 +736,7 @@ class AvrcpControllerStateMachine extends StateMachine { 
        mService.sendAbsVolRspNative(mDeviceAddress, absVol, label);

    }



    MediaSession.Callback mSessionCallbacks = new MediaSession.Callback() {

    MediaSessionCompat.Callback mSessionCallbacks = new MediaSessionCompat.Callback() {

        @Override

        public void onPlay() {

            logD("onPlay");
@@ -770,6 +809,19 @@ class AvrcpControllerStateMachine extends StateMachine { 
            BrowseTree.BrowseNode node = mBrowseTree.findBrowseNodeByID(mediaId);

            sendMessage(MESSAGE_PLAY_ITEM, node);

        }



        @Override

        public void onSetRepeatMode(int repeatMode) {

            logD("onSetRepeatMode");

            sendMessage(MSG_AVRCP_SET_REPEAT, repeatMode);

        }



        @Override

        public void onSetShuffleMode(int shuffleMode) {

            logD("onSetShuffleMode");

            sendMessage(MSG_AVRCP_SET_SHUFFLE, shuffleMode);



        }

    };



    protected void broadcastConnectionStateChanged(int currentState) {

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpPlayer.java

+71 −31
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 
package com.android.bluetooth.avrcpcontroller;



import android.media.MediaMetadata;

import android.media.session.PlaybackState;

import android.os.SystemClock;

import android.support.v4.media.session.MediaSessionCompat;

import android.support.v4.media.session.PlaybackStateCompat;

import android.util.Log;



import java.util.Arrays;
@@ -41,27 +42,31 @@ class AvrcpPlayer { 
    public static final int FEATURE_PREVIOUS = 48;

    public static final int FEATURE_BROWSING = 59;



    private int mPlayStatus = PlaybackState.STATE_NONE;

    private long mPlayTime = PlaybackState.PLAYBACK_POSITION_UNKNOWN;

    private int mPlayStatus = PlaybackStateCompat.STATE_NONE;

    private long mPlayTime = PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN;

    private long mPlayTimeUpdate = 0;

    private float mPlaySpeed = 1;

    private int mId;

    private String mName = "";

    private int mPlayerType;

    private byte[] mPlayerFeatures;

    private byte[] mPlayerFeatures = new byte[16];

    private long mAvailableActions;

    private MediaMetadata mCurrentTrack;

    private PlaybackState mPlaybackState;

    private PlaybackStateCompat mPlaybackStateCompat;

    private PlayerApplicationSettings mSupportedPlayerApplicationSettings =

            new PlayerApplicationSettings();

    private PlayerApplicationSettings mCurrentPlayerApplicationSettings;



    AvrcpPlayer() {

        mId = INVALID_ID;

        //Set Default Actions in case Player data isn't available.

        mAvailableActions = PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_PLAY

                | PlaybackState.ACTION_SKIP_TO_NEXT | PlaybackState.ACTION_SKIP_TO_PREVIOUS

                | PlaybackState.ACTION_STOP;

        PlaybackState.Builder playbackStateBuilder = new PlaybackState.Builder()

        mAvailableActions = PlaybackStateCompat.ACTION_PAUSE | PlaybackStateCompat.ACTION_PLAY

                | PlaybackStateCompat.ACTION_SKIP_TO_NEXT

                | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS

                | PlaybackStateCompat.ACTION_STOP;

        PlaybackStateCompat.Builder playbackStateBuilder = new PlaybackStateCompat.Builder()

                .setActions(mAvailableActions);

        mPlaybackState = playbackStateBuilder.build();

        mPlaybackStateCompat = playbackStateBuilder.build();

    }



    AvrcpPlayer(int id, String name, byte[] playerFeatures, int playStatus, int playerType) {
@@ -70,10 +75,10 @@ class AvrcpPlayer { 
        mPlayStatus = playStatus;

        mPlayerType = playerType;

        mPlayerFeatures = Arrays.copyOf(playerFeatures, playerFeatures.length);

        updateAvailableActions();

        PlaybackState.Builder playbackStateBuilder = new PlaybackState.Builder()

        PlaybackStateCompat.Builder playbackStateBuilder = new PlaybackStateCompat.Builder()

                .setActions(mAvailableActions);

        mPlaybackState = playbackStateBuilder.build();

        mPlaybackStateCompat = playbackStateBuilder.build();

        updateAvailableActions();

    }



    public int getId() {
@@ -87,7 +92,8 @@ class AvrcpPlayer { 
    public void setPlayTime(int playTime) {

        mPlayTime = playTime;

        mPlayTimeUpdate = SystemClock.elapsedRealtime();

        mPlaybackState = new PlaybackState.Builder(mPlaybackState).setState(mPlayStatus, mPlayTime,

        mPlaybackStateCompat = new PlaybackStateCompat.Builder(mPlaybackStateCompat).setState(

                mPlayStatus, mPlayTime,

                mPlaySpeed).build();

    }
@@ -97,30 +103,48 @@ class AvrcpPlayer { 


    public void setPlayStatus(int playStatus) {

        mPlayTime += mPlaySpeed * (SystemClock.elapsedRealtime()

                - mPlaybackState.getLastPositionUpdateTime());

                - mPlaybackStateCompat.getLastPositionUpdateTime());

        mPlayStatus = playStatus;

        switch (mPlayStatus) {

            case PlaybackState.STATE_STOPPED:

            case PlaybackStateCompat.STATE_STOPPED:

                mPlaySpeed = 0;

                break;

            case PlaybackState.STATE_PLAYING:

            case PlaybackStateCompat.STATE_PLAYING:

                mPlaySpeed = 1;

                break;

            case PlaybackState.STATE_PAUSED:

            case PlaybackStateCompat.STATE_PAUSED:

                mPlaySpeed = 0;

                break;

            case PlaybackState.STATE_FAST_FORWARDING:

            case PlaybackStateCompat.STATE_FAST_FORWARDING:

                mPlaySpeed = 3;

                break;

            case PlaybackState.STATE_REWINDING:

            case PlaybackStateCompat.STATE_REWINDING:

                mPlaySpeed = -3;

                break;

        }



        mPlaybackState = new PlaybackState.Builder(mPlaybackState).setState(mPlayStatus, mPlayTime,

        mPlaybackStateCompat = new PlaybackStateCompat.Builder(mPlaybackStateCompat).setState(

                mPlayStatus, mPlayTime,

                mPlaySpeed).build();

    }



    public void setSupportedPlayerApplicationSettings(

            PlayerApplicationSettings playerApplicationSettings) {

        mSupportedPlayerApplicationSettings = playerApplicationSettings;

        updateAvailableActions();

    }



    public void setCurrentPlayerApplicationSettings(

            PlayerApplicationSettings playerApplicationSettings) {

        Log.d(TAG, "Settings changed");

        mCurrentPlayerApplicationSettings = playerApplicationSettings;

        MediaSessionCompat session = BluetoothMediaBrowserService.getSession();

        session.setRepeatMode(mCurrentPlayerApplicationSettings.getSetting(

                PlayerApplicationSettings.REPEAT_STATUS));

        session.setShuffleMode(mCurrentPlayerApplicationSettings.getSetting(

                PlayerApplicationSettings.SHUFFLE_STATUS));

    }



    public int getPlayStatus() {

        return mPlayStatus;

    }
@@ -131,17 +155,22 @@ class AvrcpPlayer { 
        return (mPlayerFeatures[byteNumber] & bitMask) == bitMask;

    }



    public PlaybackState getPlaybackState() {

    public boolean supportsSetting(int settingType, int settingValue) {

        return mSupportedPlayerApplicationSettings.supportsSetting(settingType, settingValue);

    }



    public PlaybackStateCompat getPlaybackState() {

        if (DBG) {

            Log.d(TAG, "getPlayBackState state " + mPlayStatus + " time " + mPlayTime);

        }

        return mPlaybackState;

        return mPlaybackStateCompat;

    }



    public synchronized void updateCurrentTrack(MediaMetadata update) {

        if (update != null) {

            long trackNumber = update.getLong(MediaMetadata.METADATA_KEY_TRACK_NUMBER);

            mPlaybackState = new PlaybackState.Builder(mPlaybackState).setActiveQueueItemId(

            mPlaybackStateCompat = new PlaybackStateCompat.Builder(

                    mPlaybackStateCompat).setActiveQueueItemId(

                    trackNumber - 1).build();

        }

        mCurrentTrack = update;
@@ -153,26 +182,37 @@ class AvrcpPlayer { 


    private void updateAvailableActions() {

        if (supportsFeature(FEATURE_PLAY)) {

            mAvailableActions = mAvailableActions | PlaybackState.ACTION_PLAY;

            mAvailableActions = mAvailableActions | PlaybackStateCompat.ACTION_PLAY;

        }

        if (supportsFeature(FEATURE_STOP)) {

            mAvailableActions = mAvailableActions | PlaybackState.ACTION_STOP;

            mAvailableActions = mAvailableActions | PlaybackStateCompat.ACTION_STOP;

        }

        if (supportsFeature(FEATURE_PAUSE)) {

            mAvailableActions = mAvailableActions | PlaybackState.ACTION_PAUSE;

            mAvailableActions = mAvailableActions | PlaybackStateCompat.ACTION_PAUSE;

        }

        if (supportsFeature(FEATURE_REWIND)) {

            mAvailableActions = mAvailableActions | PlaybackState.ACTION_REWIND;

            mAvailableActions = mAvailableActions | PlaybackStateCompat.ACTION_REWIND;

        }

        if (supportsFeature(FEATURE_FAST_FORWARD)) {

            mAvailableActions = mAvailableActions | PlaybackState.ACTION_FAST_FORWARD;

            mAvailableActions = mAvailableActions | PlaybackStateCompat.ACTION_FAST_FORWARD;

        }

        if (supportsFeature(FEATURE_FORWARD)) {

            mAvailableActions = mAvailableActions | PlaybackState.ACTION_SKIP_TO_NEXT;

            mAvailableActions = mAvailableActions | PlaybackStateCompat.ACTION_SKIP_TO_NEXT;

        }

        if (supportsFeature(FEATURE_PREVIOUS)) {

            mAvailableActions = mAvailableActions | PlaybackState.ACTION_SKIP_TO_PREVIOUS;

            mAvailableActions = mAvailableActions | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;

        }

        if (mSupportedPlayerApplicationSettings.supportsSetting(

                PlayerApplicationSettings.REPEAT_STATUS)) {

            mAvailableActions |= PlaybackStateCompat.ACTION_SET_REPEAT_MODE;

        }

        if (mSupportedPlayerApplicationSettings.supportsSetting(

                PlayerApplicationSettings.SHUFFLE_STATUS)) {

            mAvailableActions |= PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE;

        }

        mPlaybackStateCompat = new PlaybackStateCompat.Builder(mPlaybackStateCompat)

                .setActions(mAvailableActions).build();



        if (DBG) Log.d(TAG, "Supported Actions = " + mAvailableActions);

    }

}

android/app/src/com/android/bluetooth/avrcpcontroller/BluetoothMediaBrowserService.java

+46 −26
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ package com.android.bluetooth.avrcpcontroller; 


import android.media.MediaMetadata;

import android.media.browse.MediaBrowser.MediaItem;

import android.media.session.MediaController;

import android.media.session.MediaSession;

import android.media.session.PlaybackState;

import android.os.Bundle;

import android.service.media.MediaBrowserService;

import android.support.v4.media.MediaBrowserCompat;

import android.support.v4.media.MediaDescriptionCompat;

import android.support.v4.media.MediaMetadataCompat;

import android.support.v4.media.session.MediaControllerCompat;

import android.support.v4.media.session.MediaSessionCompat;

import android.support.v4.media.session.PlaybackStateCompat;

import android.util.Log;



import androidx.media.MediaBrowserServiceCompat;



import com.android.bluetooth.R;



import java.util.ArrayList;
@@ -37,43 +41,44 @@ import java.util.List; 
 * The applications are expected to use MediaBrowser (see API) and all the music

 * browsing/playback/metadata can be controlled via MediaBrowser and MediaController.

 *

 * The current behavior of MediaSession exposed by this service is as follows:

 * 1. MediaSession is active (i.e. SystemUI and other overview UIs can see updates) when device is

 * connected and first starts playing. Before it starts playing we do not active the session.

 * The current behavior of MediaSessionCompat exposed by this service is as follows:

 * 1. MediaSessionCompat is active (i.e. SystemUI and other overview UIs can see updates) when

 * device is connected and first starts playing. Before it starts playing we do not activate the

 * session.

 * 1.1 The session is active throughout the duration of connection.

 * 2. The session is de-activated when the device disconnects. It will be connected again when (1)

 * happens.

 */

public class BluetoothMediaBrowserService extends MediaBrowserService {

public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat {

    private static final String TAG = "BluetoothMediaBrowserService";

    private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);



    private static BluetoothMediaBrowserService sBluetoothMediaBrowserService;



    private MediaSession mSession;

    private MediaSessionCompat mSession;



    // Browsing related structures.

    private List<MediaSession.QueueItem> mMediaQueue = new ArrayList<>();

    private List<MediaSessionCompat.QueueItem> mMediaQueue = new ArrayList<>();



    /**

     * Initialize this BluetoothMediaBrowserService, creating our MediaSession, MediaPlayer and

     * MediaMetaData, and setting up mechanisms to talk with the AvrcpControllerService.

     * Initialize this BluetoothMediaBrowserService, creating our MediaSessionCompat, MediaPlayer

     * and MediaMetaData, and setting up mechanisms to talk with the AvrcpControllerService.

     */

    @Override

    public void onCreate() {

        if (DBG) Log.d(TAG, "onCreate");

        super.onCreate();



        // Create and configure the MediaSession

        mSession = new MediaSession(this, TAG);

        // Create and configure the MediaSessionCompat

        mSession = new MediaSessionCompat(this, TAG);

        setSessionToken(mSession.getSessionToken());

        mSession.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS

                | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);

        mSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS

                | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);

        mSession.setQueueTitle(getString(R.string.bluetooth_a2dp_sink_queue_name));

        mSession.setQueue(mMediaQueue);

        PlaybackState.Builder playbackStateBuilder = new PlaybackState.Builder();

        playbackStateBuilder.setState(PlaybackState.STATE_ERROR,

                PlaybackState.PLAYBACK_POSITION_UNKNOWN, 1.0f).setActions(0);

        PlaybackStateCompat.Builder playbackStateBuilder = new PlaybackStateCompat.Builder();

        playbackStateBuilder.setState(PlaybackStateCompat.STATE_ERROR,

                PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN, 1.0f).setActions(0);

        playbackStateBuilder.setErrorMessage(getString(R.string.bluetooth_disconnected));

        mSession.setPlaybackState(playbackStateBuilder.build());

        sBluetoothMediaBrowserService = this;
@@ -91,9 +96,10 @@ public class BluetoothMediaBrowserService extends MediaBrowserService { 


    @Override

    public synchronized void onLoadChildren(final String parentMediaId,

            final Result<List<MediaItem>> result) {

            final Result<List<MediaBrowserCompat.MediaItem>> result) {

        if (DBG) Log.d(TAG, "onLoadChildren parentMediaId=" + parentMediaId);

        List<MediaItem> contents = getContents(parentMediaId);

        List<MediaBrowserCompat.MediaItem> contents =

                MediaBrowserCompat.MediaItem.fromMediaItemList(getContents(parentMediaId));

        if (contents == null) {

            result.detach();

        } else {
@@ -112,7 +118,8 @@ public class BluetoothMediaBrowserService extends MediaBrowserService { 
        mMediaQueue.clear();

        if (songList != null) {

            for (MediaItem song : songList) {

                mMediaQueue.add(new MediaSession.QueueItem(song.getDescription(),

                mMediaQueue.add(new MediaSessionCompat.QueueItem(

                        MediaDescriptionCompat.fromMediaDescription(song.getDescription()),

                        mMediaQueue.size()));

            }

        }
@@ -129,7 +136,7 @@ public class BluetoothMediaBrowserService extends MediaBrowserService { 
        }

    }



    static synchronized void addressedPlayerChanged(MediaSession.Callback callback) {

    static synchronized void addressedPlayerChanged(MediaSessionCompat.Callback callback) {

        if (sBluetoothMediaBrowserService != null) {

            sBluetoothMediaBrowserService.mSession.setCallback(callback);

        } else {
@@ -139,13 +146,14 @@ public class BluetoothMediaBrowserService extends MediaBrowserService { 


    static synchronized void trackChanged(MediaMetadata mediaMetadata) {

        if (sBluetoothMediaBrowserService != null) {

            sBluetoothMediaBrowserService.mSession.setMetadata(mediaMetadata);

            sBluetoothMediaBrowserService.mSession.setMetadata(

                    MediaMetadataCompat.fromMediaMetadata(mediaMetadata));

        } else {

            Log.w(TAG, "trackChanged Unavailable");

        }

    }



    static synchronized void notifyChanged(PlaybackState playbackState) {

    static synchronized void notifyChanged(PlaybackStateCompat playbackState) {

        Log.d(TAG, "notifyChanged PlaybackState" + playbackState);

        if (sBluetoothMediaBrowserService != null) {

            sBluetoothMediaBrowserService.mSession.setPlaybackState(playbackState);
@@ -179,7 +187,7 @@ public class BluetoothMediaBrowserService extends MediaBrowserService { 
    /**

     * Get object for controlling playback

     */

    public static synchronized MediaController.TransportControls getTransportControls() {

    public static synchronized MediaControllerCompat.TransportControls getTransportControls() {

        if (sBluetoothMediaBrowserService != null) {

            return sBluetoothMediaBrowserService.mSession.getController().getTransportControls();

        } else {
@@ -198,4 +206,16 @@ public class BluetoothMediaBrowserService extends MediaBrowserService { 
            Log.w(TAG, "setActive Unavailable");

        }

    }



    /**

     * Get Media session for updating state

     */

    public static synchronized MediaSessionCompat getSession() {

        if (sBluetoothMediaBrowserService != null) {

            return sBluetoothMediaBrowserService.mSession;

        } else {

            Log.w(TAG, "getSession Unavailable");

            return null;

        }

    }

}