AVRCP_Browse: Browse Player-list based on MBS connect
Prepare Browseable players list based on MBS connection
at the time of BT On send MBS connection for all players
via BrowseMediaPlayer interface. If player's manifest
says it has MBS interface but disallows our connection
don't add it in list of Browsable Player list and also
disable bit-mask in response of GetFolderItems(MP List)
CRs-Fixed: 2463251
Change-Id: Ib1f238b1eeacacd35fdbd2841b79981b6b80be86
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index e1510bf..bef8fa9 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -178,6 +178,8 @@
private boolean isShoActive = false;
private boolean twsShoEnabled = false;
+ byte[] dummyaddr = {(byte)0xFA, (byte)0xCE, (byte)0xFA,
+ (byte)0xCE, (byte)0xFA, (byte)0xCE};
private static final String playerStateUpdateBlackListedAddr[] = {
"BC:30:7E", //bc-30-7e-5e-f6-27, Name: Porsche BT 0310; bc-30-7e-8c-22-cb, Name: Audi MMI 1193
"00:1E:43", //00-1e-43-14-f0-68, Name: Audi MMI 4365
@@ -3497,7 +3499,11 @@
if ((mCurrentBrowsingDevice != null) &&
(mCurrentBrowsingDevice.equals(device))) {
Log.v(TAG,"BT device is matched with browsing device:");
- mAvrcpBrowseManager.cleanup();
+ BrowsedMediaPlayer_ext player =
+ mAvrcpBrowseManager.getBrowsedMediaPlayer(getByteAddress(device));
+ if (player != null)
+ player.disconnect();
+ mAvrcpBrowseManager.clearBrowsedMediaPlayer(getByteAddress(device));
mCurrentBrowsingDevice = null;
changePathDepth = 0;
changePathFolderType = 0;
@@ -3885,6 +3891,11 @@
synchronized (this) {
synchronized (mBrowsePlayerInfoList) {
mBrowsePlayerInfoList.clear();
+ BrowsedMediaPlayer_ext player =
+ mAvrcpBrowseManager.getBrowsedMediaPlayer(dummyaddr);
+ if (player != null)
+ player.start();
+ Log.d(TAG, "buildBrowsablePlayerList " + player);
Intent intent = new Intent(android.service.media.MediaBrowserService.SERVICE_INTERFACE);
List<ResolveInfo> playerList =
mPackageManager.queryIntentServices(intent, PackageManager.MATCH_ALL);
@@ -3895,8 +3906,10 @@
(displayName != null) ? displayName.toString():new String();
String serviceName = info.serviceInfo.name;
String packageName = info.serviceInfo.packageName;
-
- if (DEBUG) Log.d(TAG, "Adding " + serviceName + " to list of browsable players");
+ Log.d(TAG, "svc " + serviceName + " and pkg = " + packageName);
+ if ((player != null) && (serviceName != null)) {
+ player.CheckMBSConnection(packageName, serviceName);
+ }
BrowsePlayerInfo_ext currentPlayer =
new BrowsePlayerInfo_ext(packageName, displayableName, serviceName);
mBrowsePlayerInfoList.add(currentPlayer);
@@ -4269,13 +4282,25 @@
playStatusValues[idx] = info.getPlayStatus();
short[] featureBits = info.getFeatureBitMask();
- for (int numBit = 0; numBit < featureBits.length; numBit++) {
- /* gives which octet this belongs to */
- byte octet = (byte) (featureBits[numBit] / 8);
- /* gives the bit position within the octet */
- byte bit = (byte) (featureBits[numBit] % 8);
- featureBitMaskValues[(idx * AvrcpConstants_ext.AVRC_FEATURE_MASK_SIZE) + octet] |=
- (1 << bit);
+ short[] featureBitsArray = {0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, 0x01, 0x04,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+ String browsedPackage = getPackageName(mCurrAddrPlayerID);
+ BrowsedMediaPlayer_ext player =
+ mAvrcpBrowseManager.getBrowsedMediaPlayer(dummyaddr);
+ if ((player != null) && (!browsedPackage.isEmpty()) &&
+ player.isPackageInMBSList(browsedPackage)) {
+ for (int numBit = 0; numBit < featureBits.length; numBit++) {
+ /* gives which octet this belongs to */
+ byte octet = (byte) (featureBits[numBit] / 8);
+ /* gives the bit position within the octet */
+ byte bit = (byte) (featureBits[numBit] % 8);
+ featureBitMaskValues[(idx * AvrcpConstants_ext.AVRC_FEATURE_MASK_SIZE) + octet] |=
+ (1 << bit);
+ }
+ } else {
+ featureBitMaskValues =
+ Arrays.copyOf(featureBitsArray, featureBitsArray.length);
+ Log.w(TAG, "sending bit mask for non Browsable Player");
}
/* printLogs */
diff --git a/packages_apps_bluetooth_ext/src/avrcp/BrowsedMediaPlayer_ext.java b/packages_apps_bluetooth_ext/src/avrcp/BrowsedMediaPlayer_ext.java
index f8290f5..1327a4a 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/BrowsedMediaPlayer_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/BrowsedMediaPlayer_ext.java
@@ -26,6 +26,10 @@
import android.media.session.MediaSession;
import android.os.Bundle;
import android.util.Log;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -48,6 +52,11 @@
private static final int CONNECTED = 1;
private static final int SUSPENDED = 2;
+ private static final int MSG_CONNECT_PLAYER = 1;
+ private static final int MSG_DISCONNECT_PLAYER = 2;
+ private static final int MSG_TIMEOUT = 3;
+
+ private static final int TIMEOUT = 3000;
private static final int BROWSED_ITEM_ID_INDEX = 2;
private static final int BROWSED_FOLDER_ID_INDEX = 4;
private static final String[] ROOT_FOLDER = {"root"};
@@ -64,6 +73,9 @@
private String mCurrentBrowsePackage;
private String mCurrentBrowseClass;
+ private BrowseMediaHandler mHandler = null;
+ private HandlerThread mHandlerThread;
+
/* Object used to connect to MediaBrowseService of Media Player */
private MediaBrowser mMediaBrowser = null;
private MediaController mMediaController = null;
@@ -90,6 +102,44 @@
/* store result of getfolderitems with scope="vfs" */
private List<MediaBrowser.MediaItem> mFolderItems = null;
+ private List<String> mBrowsablePlayerList = new ArrayList<String>();
+
+ class BrowseMediaHandler extends Handler {
+ BrowseMediaHandler(Looper looper) {
+ super(looper);
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ Log.w(TAG, "handleMessage " + msg.what + " obj " + msg.obj);
+ switch (msg.what) {
+ case MSG_CONNECT_PLAYER:
+ Bundle data = msg.getData();
+ String packageName = data.getCharSequence("package").toString();
+ String cls = data.getCharSequence("class").toString();
+ Log.w(TAG, "package = " + packageName + " svc class " + cls);
+ MediaConnectionCallback callback = new MediaConnectionCallback(packageName);
+ MediaBrowser tempBrowser = new MediaBrowser(
+ mContext, new ComponentName(packageName, cls), callback, null);
+ callback.setBrowser(tempBrowser);
+ tempBrowser.connect();
+ Log.w(TAG, "TryconnectMBS with Browser service");
+ Message m = mHandler.obtainMessage(MSG_TIMEOUT, 0, 0, packageName);
+ mHandler.sendMessageDelayed(m, TIMEOUT);
+ break;
+ case MSG_DISCONNECT_PLAYER:
+ MediaBrowser mb = (MediaBrowser)msg.obj;
+ mb.disconnect();
+ Log.w(TAG, "Trigger disconnect for MediaBrowser " + mb);
+ break;
+ case MSG_TIMEOUT:
+ Log.w(TAG, "MSG_TIMEOUT");
+ break;
+ default:
+ break;
+ }
+ }
+ };
/* Connection state callback handler */
class MediaConnectionCallback extends MediaBrowser.ConnectionCallback {
@@ -101,15 +151,21 @@
}
public void setBrowser(MediaBrowser b) {
+ Log.d(TAG, "setBrowser " + b);
mBrowser = b;
}
@Override
public void onConnected() {
- mConnState = CONNECTED;
- if (DEBUG) {
- Log.d(TAG, "mediaBrowser CONNECTED to " + mPackageName);
+ if ((mHandler != null) && !mBrowsablePlayerList.contains(mCallbackPackageName)) {
+ Log.d(TAG, "Add " + mCallbackPackageName + " to MBS List " + mBrowser);
+ mBrowsablePlayerList.add(mCallbackPackageName);
+ mHandler.removeMessages(MSG_TIMEOUT, mCallbackPackageName);
+ Message msg = mHandler.obtainMessage(MSG_DISCONNECT_PLAYER, 0, 0, mBrowser);
+ mHandler.sendMessage(msg);
}
+ mConnState = CONNECTED;
+ Log.d(TAG, "mediaBrowser CONNECTED to " + mPackageName);
/* perform init tasks and set player as browsed player on successful connection */
onBrowseConnect(mCallbackPackageName, mBrowser);
@@ -119,17 +175,23 @@
@Override
public void onConnectionFailed() {
+ if ((mHandler != null) && !mBrowsablePlayerList.contains(mCallbackPackageName)) {
+ mHandler.removeMessages(MSG_TIMEOUT, mCallbackPackageName);
+ }
mConnState = DISCONNECTED;
// Remove what could be a circular dependency causing GC to never happen on this object
mBrowser = null;
Log.e(TAG, "mediaBrowser Connection failed with " + mPackageName
+ ", Sending fail response!");
- mMediaInterface.setBrowsedPlayerRsp(mBDAddr, AvrcpConstants_ext.RSP_INTERNAL_ERR,
+ mMediaInterface.setBrowsedPlayerRsp(mBDAddr, AvrcpConstants_ext.RSP_PLAY_NOT_BROW,
(byte) 0x00, 0, null);
}
@Override
public void onConnectionSuspended() {
+ if ((mHandler != null) && !mBrowsablePlayerList.contains(mCallbackPackageName)) {
+ mHandler.removeMessages(MSG_TIMEOUT, mCallbackPackageName);
+ }
mBrowser = null;
mConnState = SUSPENDED;
Log.e(TAG, "mediaBrowser SUSPENDED connection with " + mPackageName);
@@ -480,18 +542,80 @@
Log.w(TAG, "Reconnected with Browser service");
}
+ public void CheckMBSConnection(String packageName, String cls) {
+ Log.w(TAG, "TryconnectMBS with Browser service for package = " + packageName);
+ Message msg = mHandler.obtainMessage(MSG_CONNECT_PLAYER);
+ Bundle data = new Bundle();
+ data.putCharSequence("package", packageName);
+ data.putCharSequence("class", cls);
+ msg.setData(data);
+ mHandler.sendMessage(msg);
+ Log.w(TAG, "Exit MSG_CONNECT_PLAYER for package = " + packageName);
+ }
+
+ public boolean isPackageInMBSList(String packageName) {
+ if (packageName == null || packageName.isEmpty())
+ return false;
+ Log.w(TAG, "isPlayerConnectedMBS for package = " + packageName);
+
+ // Wait while pending messages are in queue
+ while ((mHandler != null) && (mHandler.hasMessages(MSG_CONNECT_PLAYER)
+ || mHandler.hasMessages(MSG_TIMEOUT))) {
+ try {
+ Log.d(TAG, "Connection with MBS ongoing, sleep for 200 ms and recheck");
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ Log.w(TAG, "Interrupt sleep caught Exception");
+ }
+ }
+
+ Log.w(TAG, "List of Browse supported players = " + mBrowsablePlayerList);
+ for (String pkg : mBrowsablePlayerList) {
+ if (packageName.equals(pkg))
+ return true;
+ }
+ return false;
+ }
+
public void setCurrentPackage(String packageName, String cls) {
Log.w(TAG, "Set current Browse based on Addr Player as " + packageName);
mCurrentBrowsePackage = packageName;
mCurrentBrowseClass = cls;
}
+ public void start() {
+ if (mHandler == null) {
+ Log.w(TAG, "start");
+ mHandlerThread = new HandlerThread("BrowseMediaHandler");
+ mHandlerThread.start();
+ mHandler = new BrowseMediaHandler(mHandlerThread.getLooper());
+ }
+ Log.w(TAG, "start exit");
+ }
+
/* called when connection to media player is closed */
public void cleanup() {
+ disconnect();
if (DEBUG) {
Log.d(TAG, "cleanup");
}
+ mBrowsablePlayerList.clear();
+ if (mHandler != null) {
+ Log.d(TAG, "cleanup handlers");
+ mHandler.removeCallbacksAndMessages(null);
+ Looper looper = mHandler.getLooper();
+ if (looper != null)
+ looper.quit();
+ }
+ if (mHandlerThread != null) {
+ mHandlerThread.quitSafely();
+ }
+ }
+ public void disconnect() {
+ if (DEBUG) {
+ Log.d(TAG, "disconnect");
+ }
if (mConnState != DISCONNECTED) {
if (mMediaBrowser != null) mMediaBrowser.disconnect();
}