From 702c59f80ab9c21d6b4d673d50380e18c477f88c Mon Sep 17 00:00:00 2001
From: Sanket Agarwal <sanketa@google.com>
Date: Fri, 22 Jan 2016 12:26:36 -0800
Subject: [PATCH] Add MediaBrowser implementaion for A2DP.

MediaBrowser is a way to control playback of any generic media
application and to conform to this framework API the a2dpsink client
uses the same format.

This middleware provides a way to use A2DP via the MediaBrowserService
and a user for A2DP sink should not need to use the raw Bluetooth APIs.

Change-Id: I73b4a51acc469f503286bfd6d33a1766e30fc50d
---
 services/A2dpMediaBrowserService/Android.mk        |  19 +
 .../A2dpMediaBrowserService/AndroidManifest.xml    |  51 +++
 .../res/drawable-hdpi/ic_launcher.png              | Bin 0 -> 4151 bytes
 .../res/drawable-hdpi/ic_notification.png          | Bin 0 -> 4151 bytes
 .../res/values-v21/styles.xml                      |  23 ++
 .../A2dpMediaBrowserService/res/values/strings.xml |  21 ++
 .../A2dpMediaBrowserService/res/values/styles.xml  |  20 ++
 .../res/xml/automotive_app_desc.xml                |  19 +
 .../a2dpsink/mbs/A2dpMediaBrowserService.java      | 385 +++++++++++++++++++++
 .../android/a2dpsink/mbs/BootCompleteReceiver.java |  31 ++
 10 files changed, 569 insertions(+)
 create mode 100644 services/A2dpMediaBrowserService/Android.mk
 create mode 100644 services/A2dpMediaBrowserService/AndroidManifest.xml
 create mode 100644 services/A2dpMediaBrowserService/res/drawable-hdpi/ic_launcher.png
 create mode 100644 services/A2dpMediaBrowserService/res/drawable-hdpi/ic_notification.png
 create mode 100644 services/A2dpMediaBrowserService/res/values-v21/styles.xml
 create mode 100644 services/A2dpMediaBrowserService/res/values/strings.xml
 create mode 100644 services/A2dpMediaBrowserService/res/values/styles.xml
 create mode 100644 services/A2dpMediaBrowserService/res/xml/automotive_app_desc.xml
 create mode 100644 services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/A2dpMediaBrowserService.java
 create mode 100644 services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/BootCompleteReceiver.java

diff --git a/services/A2dpMediaBrowserService/Android.mk b/services/A2dpMediaBrowserService/Android.mk
new file mode 100644
index 00000000..f7a5e97f
--- /dev/null
+++ b/services/A2dpMediaBrowserService/Android.mk
@@ -0,0 +1,19 @@
+# Copyright 2015 Google Inc. All Rights Reserved.
+
+LOCAL_PATH := $(call my-dir)
+
+# Build the application.
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := A2dpMediaBrowserService
+LOCAL_MODULE_TAGS := optional
+LOCAL_CERTIFICATE := platform
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR = $(LOCAL_PATH)/res
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/services/A2dpMediaBrowserService/AndroidManifest.xml b/services/A2dpMediaBrowserService/AndroidManifest.xml
new file mode 100644
index 00000000..fa63ff48
--- /dev/null
+++ b/services/A2dpMediaBrowserService/AndroidManifest.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2015, 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.a2dpsink.mbs" >
+
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <application
+        android:allowBackup="false"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <meta-data android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
+
+        <meta-data android:name="com.google.android.gms.car.notification.SmallIcon"
+            android:resource="@drawable/ic_notification" />
+
+        <service android:name=".A2dpMediaBrowserService" android:exported="true">
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService" />
+            </intent-filter>
+        </service>
+
+        <receiver android:name=".BootCompleteReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+    </application>
+</manifest>
diff --git a/services/A2dpMediaBrowserService/res/drawable-hdpi/ic_launcher.png b/services/A2dpMediaBrowserService/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..9075ff1bd1a81359d50b59dba7c113c88c6261fe
GIT binary patch
literal 4151
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
Bu>$}A

literal 0
HcmV?d00001

diff --git a/services/A2dpMediaBrowserService/res/drawable-hdpi/ic_notification.png b/services/A2dpMediaBrowserService/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..9075ff1bd1a81359d50b59dba7c113c88c6261fe
GIT binary patch
literal 4151
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
Bu>$}A

literal 0
HcmV?d00001

diff --git a/services/A2dpMediaBrowserService/res/values-v21/styles.xml b/services/A2dpMediaBrowserService/res/values-v21/styles.xml
new file mode 100644
index 00000000..7caef1f6
--- /dev/null
+++ b/services/A2dpMediaBrowserService/res/values-v21/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2015, 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.
+-->
+<resources>
+    <style name="AppBaseTheme" parent="android:Theme.Material">
+        <item name="android:colorPrimary">#ffff5722</item>
+        <item name="android:colorPrimaryDark">#ffbf360c</item>
+        <item name="android:colorAccent">#ffff5722</item>
+    </style>
+</resources>
diff --git a/services/A2dpMediaBrowserService/res/values/strings.xml b/services/A2dpMediaBrowserService/res/values/strings.xml
new file mode 100644
index 00000000..588a124e
--- /dev/null
+++ b/services/A2dpMediaBrowserService/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2015, 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.
+-->
+<resources>
+        <string name="app_name">Bluetooth Audio</string>
+        <string name="bluetooth_connected">Bluetooth audio connected</string>
+        <string name="bluetooth_disconnected">Bluetooth audio disconnected"</string>
+</resources>
diff --git a/services/A2dpMediaBrowserService/res/values/styles.xml b/services/A2dpMediaBrowserService/res/values/styles.xml
new file mode 100644
index 00000000..45c2579e
--- /dev/null
+++ b/services/A2dpMediaBrowserService/res/values/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2015, 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.
+-->
+<resources>
+    <style name="AppTheme" parent="AppBaseTheme" />
+    <style name="AppBaseTheme" parent="android:Theme.Light" />
+</resources>
diff --git a/services/A2dpMediaBrowserService/res/xml/automotive_app_desc.xml b/services/A2dpMediaBrowserService/res/xml/automotive_app_desc.xml
new file mode 100644
index 00000000..a5bac631
--- /dev/null
+++ b/services/A2dpMediaBrowserService/res/xml/automotive_app_desc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2015, 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.
+-->
+<automotiveApp>
+    <uses name="media"/>
+</automotiveApp>
diff --git a/services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/A2dpMediaBrowserService.java b/services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/A2dpMediaBrowserService.java
new file mode 100644
index 00000000..2a6baa89
--- /dev/null
+++ b/services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/A2dpMediaBrowserService.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright (C) 2015 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.google.android.a2dpsink.mbs;
+
+import android.bluetooth.BluetoothA2dpSink;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothAvrcpController;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+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.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.os.ResultReceiver;
+import android.service.media.MediaBrowserService;
+import android.util.Pair;
+import android.util.Log;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+public class A2dpMediaBrowserService extends MediaBrowserService {
+    private static final String TAG = "A2dpMediaBrowserService";
+    private static final String MEDIA_ID_ROOT = "__ROOT__";
+    private static final String UNKNOWN_BT_AUDIO = "__UNKNOWN_BT_AUDIO__";
+    private static final float PLAYBACK_SPEED = 1.0f;
+
+    // Message sent when A2DP device is disconnected.
+    private static final int MSG_DEVICE_DISCONNECT = 0;
+    // Message snet when the AVRCP profile is disconnected = 1;
+    private static final int MSG_PROFILE_DISCONNECT = 1;
+    // Message sent when A2DP device is connected.
+    private static final int MSG_DEVICE_CONNECT = 2;
+    // Message sent when AVRCP profile is connected (note AVRCP profile may be connected before or
+    // after A2DP device is connected).
+    private static final int MSG_PROFILE_CONNECT = 3;
+    // Message sent when we recieve a TRACK update from AVRCP profile over a connected A2DP device.
+    private static final int MSG_TRACK = 4;
+    // Internal message sent to trigger a AVRCP action.
+    private static final int MSG_AVRCP_PASSTHRU = 5;
+
+    private MediaSession mSession;
+    private MediaMetadata mA2dpMetadata;
+
+    private BluetoothAdapter mAdapter;
+    private BluetoothAvrcpController mAvrcpProfile;
+    private BluetoothDevice mA2dpDevice = null;
+    private Handler mAvrcpCommandQueue;
+
+    private long mTransportControlFlags = PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_PLAY
+            | PlaybackState.ACTION_SKIP_TO_NEXT | PlaybackState.ACTION_SKIP_TO_PREVIOUS;
+
+    private static final class AvrcpCommandQueueHandler extends Handler {
+        WeakReference<A2dpMediaBrowserService> mInst;
+
+        AvrcpCommandQueueHandler(Looper looper, A2dpMediaBrowserService sink) {
+            super(looper);
+            mInst = new WeakReference<A2dpMediaBrowserService>(sink);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            A2dpMediaBrowserService inst = mInst.get();
+            if (inst == null) {
+                Log.e(TAG, "Parent class has died; aborting.");
+                return;
+            }
+
+            switch (msg.what) {
+                case MSG_DEVICE_CONNECT:
+                    inst.msgDeviceConnect((BluetoothDevice) msg.obj);
+                    break;
+                case MSG_PROFILE_CONNECT:
+                    inst.msgProfileConnect((BluetoothProfile) msg.obj);
+                    break;
+                case MSG_DEVICE_DISCONNECT:
+                    inst.msgDeviceDisconnect((BluetoothDevice) msg.obj);
+                    break;
+                case MSG_PROFILE_DISCONNECT:
+                    inst.msgProfileDisconnect();
+                    break;
+                case MSG_TRACK:
+                    Pair<PlaybackState, MediaMetadata> pair =
+                        (Pair<PlaybackState, MediaMetadata>) (msg.obj);
+                    inst.msgTrack(pair.first, pair.second);
+                    break;
+                case MSG_AVRCP_PASSTHRU:
+                    inst.msgPassThru((int) msg.obj);
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        Log.d(TAG, "onCreate");
+        super.onCreate();
+        mSession = new MediaSession(this, TAG);
+        setSessionToken(mSession.getSessionToken());
+        mSession.setCallback(mSessionCallbacks);
+        mSession.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS |
+                MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
+        mAvrcpCommandQueue = new AvrcpCommandQueueHandler(Looper.getMainLooper(), this);
+
+        mAdapter = BluetoothAdapter.getDefaultAdapter();
+        mAdapter.getProfileProxy(this, mServiceListener, BluetoothProfile.AVRCP_CONTROLLER);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothA2dpSink.ACTION_CONNECTION_STATE_CHANGED);
+        filter.addAction(BluetoothAvrcpController.ACTION_TRACK_EVENT);
+        registerReceiver(mBtReceiver, filter);
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d(TAG, "onDestroy");
+        mSession.release();
+        unregisterReceiver(mBtReceiver);
+        super.onDestroy();
+    }
+
+    @Override
+    public BrowserRoot onGetRoot(String clientPackageName, int clientUid, Bundle rootHints) {
+        return new BrowserRoot(MEDIA_ID_ROOT, null);
+    }
+
+    @Override
+    public void onLoadChildren(final String parentMediaId, final Result<List<MediaItem>> result) {
+        Log.d(TAG, "onLoadChildren parentMediaId=" + parentMediaId);
+        List<MediaItem> items = new ArrayList<MediaItem>();
+        result.sendResult(items);
+    }
+
+    BluetoothProfile.ServiceListener mServiceListener = new BluetoothProfile.ServiceListener() {
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            Log.d(TAG, "onServiceConnected");
+            if (profile == BluetoothProfile.AVRCP_CONTROLLER) {
+                mAvrcpCommandQueue.obtainMessage(MSG_PROFILE_CONNECT, proxy).sendToTarget();
+                List<BluetoothDevice> devices = proxy.getConnectedDevices();
+                if (devices != null && devices.size() > 0) {
+                    BluetoothDevice device = devices.get(0);
+                    Log.d(TAG, "got AVRCP device " + device);
+                }
+            }
+        }
+
+        public void onServiceDisconnected(int profile) {
+            Log.d(TAG, "onServiceDisconnected " + profile);
+            if (profile == BluetoothProfile.AVRCP_CONTROLLER) {
+                mAvrcpProfile = null;
+                mAvrcpCommandQueue.obtainMessage(MSG_PROFILE_DISCONNECT).sendToTarget();
+            }
+        }
+    };
+
+    // Media Session Stuff.
+    private MediaSession.Callback mSessionCallbacks = new MediaSession.Callback() {
+        @Override
+        public void onPlay() {
+            Log.d(TAG, "onPlay");
+            mAvrcpCommandQueue.obtainMessage(
+                MSG_AVRCP_PASSTHRU, BluetoothAvrcpController.PASS_THRU_CMD_ID_PLAY).sendToTarget();
+            // TRACK_EVENT should be fired eventually and the UI should be hence updated.
+        }
+
+        @Override
+        public void onPause() {
+            Log.d(TAG, "onPause");
+            mAvrcpCommandQueue.obtainMessage(
+                MSG_AVRCP_PASSTHRU, BluetoothAvrcpController.PASS_THRU_CMD_ID_PAUSE).sendToTarget();
+            // TRACK_EVENT should be fired eventually and the UI should be hence updated.
+        }
+
+        @Override
+        public void onSkipToNext() {
+            Log.d(TAG, "onSkipToNext");
+            mAvrcpCommandQueue.obtainMessage(
+                MSG_AVRCP_PASSTHRU, BluetoothAvrcpController.PASS_THRU_CMD_ID_FORWARD)
+                .sendToTarget();
+            // TRACK_EVENT should be fired eventually and the UI should be hence updated.
+        }
+
+        @Override
+        public void onSkipToPrevious() {
+            Log.d(TAG, "onSkipToPrevious");
+
+            mAvrcpCommandQueue.obtainMessage(
+                MSG_AVRCP_PASSTHRU, BluetoothAvrcpController.PASS_THRU_CMD_ID_BACKWARD)
+                .sendToTarget();
+            // TRACK_EVENT should be fired eventually and the UI should be hence updated.
+        }
+
+        // These are not yet supported.
+        @Override
+        public void onStop() {
+            Log.d(TAG, "onStop");
+        }
+
+        @Override
+        public void onCustomAction(String action, Bundle extras) {
+            Log.d(TAG, "onCustomAction action=" + action + " extras=" + extras);
+        }
+
+        @Override
+        public void onPlayFromSearch(String query, Bundle extras) {
+            Log.d(TAG, "playFromSearch not supported in AVRCP");
+        }
+
+        @Override
+        public void onCommand(String command, Bundle args, ResultReceiver cb) {
+            Log.d(TAG, "onCommand command=" + command + " args=" + args);
+        }
+
+        @Override
+        public void onSkipToQueueItem(long queueId) {
+            Log.d(TAG, "onSkipToQueueItem");
+        }
+
+        @Override
+        public void onPlayFromMediaId(String mediaId, Bundle extras) {
+            Log.d(TAG, "onPlayFromMediaId mediaId=" + mediaId + " extras=" + extras);
+        }
+
+    };
+
+    private BroadcastReceiver mBtReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "onReceive intent=" + intent);
+            String action = intent.getAction();
+            BluetoothDevice btDev =
+                    (BluetoothDevice) intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            int state = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1);
+
+            if (BluetoothA2dpSink.ACTION_CONNECTION_STATE_CHANGED.equals(action)) {
+                Log.d(TAG, "handleConnectionStateChange: newState="
+                        + state + " btDev=" + btDev);
+
+                // Connected state will be handled when AVRCP BluetoothProfile gets connected.
+                if (state == BluetoothProfile.STATE_CONNECTED) {
+                    mAvrcpCommandQueue.obtainMessage(MSG_DEVICE_CONNECT, btDev).sendToTarget();
+                } else if (state == BluetoothProfile.STATE_DISCONNECTED) {
+                    // Set the playback state to unconnected.
+                    mAvrcpCommandQueue.obtainMessage(MSG_DEVICE_DISCONNECT, btDev).sendToTarget();
+                }
+            } else if (BluetoothAvrcpController.ACTION_TRACK_EVENT.equals(action)) {
+                PlaybackState pbb =
+                    intent.getParcelableExtra(BluetoothAvrcpController.EXTRA_PLAYBACK);
+                MediaMetadata mmd =
+                    intent.getParcelableExtra(BluetoothAvrcpController.EXTRA_METADATA);
+                mAvrcpCommandQueue.obtainMessage(
+                    MSG_TRACK, new Pair<PlaybackState, MediaMetadata>(pbb, mmd)).sendToTarget();
+            }
+        }
+    };
+
+    private void msgDeviceConnect(BluetoothDevice device) {
+        Log.d(TAG, "msgDeviceConnect");
+        // We are connected to a new device via A2DP now.
+        mA2dpDevice = device;
+    }
+
+    private void msgProfileConnect(BluetoothProfile profile) {
+        Log.d(TAG, "msgProfileConnect");
+        if (profile != null) {
+            mAvrcpProfile = (BluetoothAvrcpController) profile;
+        }
+
+        List<BluetoothDevice> devices = mAvrcpProfile.getConnectedDevices();
+        if (devices.size() == 0) {
+            Log.w(TAG, "No devices connected yet");
+            return;
+        }
+
+        if (mA2dpDevice != null && !mA2dpDevice.equals(devices.get(0))) {
+            Log.e(TAG, "A2dp device : " + mA2dpDevice + " avrcp device " + devices.get(0));
+        }
+        mA2dpDevice = devices.get(0);
+
+        PlaybackState playbackState = mAvrcpProfile.getPlaybackState(mA2dpDevice);
+        // Add actions required for playback and rebuild the object.
+        PlaybackState.Builder pbb = new PlaybackState.Builder(playbackState);
+        playbackState = pbb.setActions(mTransportControlFlags).build();
+
+        MediaMetadata mediaMetadata = mAvrcpProfile.getMetadata(mA2dpDevice);
+        Log.d(TAG, "Media metadata " + mediaMetadata + " playback state " + playbackState);
+        mSession.setMetadata(mAvrcpProfile.getMetadata(mA2dpDevice));
+        mSession.setPlaybackState(playbackState);
+    }
+
+    private void msgDeviceDisconnect(BluetoothDevice device) {
+        Log.d(TAG, "msgDeviceDisconnect");
+        if (mA2dpDevice == null) {
+            Log.w(TAG, "Already disconnected - nothing to do here.");
+            return;
+        } else if (!mA2dpDevice.equals(device)) {
+            Log.e(TAG, "Not the right device to disconnect current " +
+                mA2dpDevice + " dc " + device);
+            return;
+        }
+
+        // Unset the session.
+        PlaybackState.Builder pbb = new PlaybackState.Builder();
+        pbb = pbb.setState(PlaybackState.STATE_ERROR, PlaybackState.PLAYBACK_POSITION_UNKNOWN,
+                    PLAYBACK_SPEED)
+                .setActions(mTransportControlFlags)
+                .setErrorMessage(getString(R.string.bluetooth_disconnected));
+        mSession.setPlaybackState(pbb.build());
+    }
+
+    private void msgProfileDisconnect() {
+        Log.d(TAG, "msgProfileDisconnect");
+        // The profile is disconnected - even if the device is still connected we cannot really have
+        // a functioning UI so reset the session.
+        mAvrcpProfile = null;
+
+        // Unset the session.
+        PlaybackState.Builder pbb = new PlaybackState.Builder();
+        pbb = pbb.setState(PlaybackState.STATE_ERROR, PlaybackState.PLAYBACK_POSITION_UNKNOWN,
+                    PLAYBACK_SPEED)
+                .setActions(mTransportControlFlags)
+                .setErrorMessage(getString(R.string.bluetooth_disconnected));
+        mSession.setPlaybackState(pbb.build());
+    }
+
+    private void msgTrack(PlaybackState pb, MediaMetadata mmd) {
+        Log.d(TAG, "msgTrack: playback: " + pb + " mmd: " + mmd);
+        if (mmd != null) {
+            Log.d(TAG, "msgTrack() mmd " + mmd.getDescription());
+            mSession.setMetadata(mmd);
+        }
+
+        if (pb != null) {
+            Log.d(TAG, "msgTrack() playbackstate " + pb);
+            PlaybackState.Builder pbb = new PlaybackState.Builder(pb);
+            pb = pbb.setActions(mTransportControlFlags).build();
+            mSession.setPlaybackState(pb);
+        }
+    }
+
+    private void msgPassThru(int cmd) {
+        Log.d(TAG, "msgPassThru " + cmd);
+        if (mA2dpDevice == null) {
+            // We should have already disconnected - ignore this message.
+            Log.e(TAG, "Already disconnected ignoring.");
+            return;
+        }
+
+        if (mAvrcpProfile == null) {
+            // We may be disconnected with the profile but there is not much we can do for now but
+            // to wait for the profile to come back up.
+            Log.e(TAG, "Profile disconnected; ignoring.");
+            return;
+        }
+
+        // Send the pass through.
+        mAvrcpProfile.sendPassThroughCmd(
+            mA2dpDevice, cmd, BluetoothAvrcpController.KEY_STATE_PRESSED);
+        mAvrcpProfile.sendPassThroughCmd(
+            mA2dpDevice, cmd, BluetoothAvrcpController.KEY_STATE_RELEASED);
+    }
+}
diff --git a/services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/BootCompleteReceiver.java b/services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/BootCompleteReceiver.java
new file mode 100644
index 00000000..0c86b84a
--- /dev/null
+++ b/services/A2dpMediaBrowserService/src/com/google/android/a2dpsink/mbs/BootCompleteReceiver.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 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.google.android.a2dpsink.mbs;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class BootCompleteReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        // We want to keep a track of bluetooth state so start up the service
+        // on boot and keep making a note of all bluetooth related state changes.
+        Intent startIntent = new Intent(context, A2dpMediaBrowserService.class);
+        context.startService(startIntent);
+    }
+}
-- 
2.11.0