Merge changes I99ca081f,Ic252ee0b am: 6dc8615886 am: 4ec3cafa61 am: 7555815234 (a757c7c1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/a2dpsink/mbs/A2dpMediaBrowserService.java

+46 −21

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,6 @@ import android.os.Bundle;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;
	import android.os.Parcelable;
	import android.service.media.MediaBrowserService;		import android.service.media.MediaBrowserService;
	import android.util.Log;		import android.util.Log;
	import android.util.Pair;		import android.util.Pair;
	@@ -44,7 +43,6 @@ import com.android.bluetooth.avrcpcontroller.AvrcpControllerService;
	import com.android.bluetooth.avrcpcontroller.BrowseTree;		import com.android.bluetooth.avrcpcontroller.BrowseTree;

	import java.lang.ref.WeakReference;		import java.lang.ref.WeakReference;
	import java.util.ArrayList;
	import java.util.Collections;		import java.util.Collections;
	import java.util.HashMap;		import java.util.HashMap;
	import java.util.List;		import java.util.List;
	@@ -97,6 +95,7 @@ public class A2dpMediaBrowserService extends MediaBrowserService {
	private static final String CUSTOM_ACTION_GET_PLAY_STATUS_NATIVE =		private static final String CUSTOM_ACTION_GET_PLAY_STATUS_NATIVE =
	"com.android.bluetooth.a2dpsink.mbs.CUSTOM_ACTION_GET_PLAY_STATUS_NATIVE";		"com.android.bluetooth.a2dpsink.mbs.CUSTOM_ACTION_GET_PLAY_STATUS_NATIVE";

			private static A2dpMediaBrowserService sA2dpMediaBrowserService;
	private MediaSession mSession;		private MediaSession mSession;
	private MediaMetadata mA2dpMetadata;		private MediaMetadata mA2dpMetadata;

	@@ -185,18 +184,41 @@ public class A2dpMediaBrowserService extends MediaBrowserService {
	synchronized (this) {		synchronized (this) {
	mParentIdToRequestMap.clear();		mParentIdToRequestMap.clear();
	}		}
			setA2dpMediaBrowserService(this);

	}		}

	@Override		@Override
	public void onDestroy() {		public void onDestroy() {
	if (DBG) Log.d(TAG, "onDestroy");		if (DBG) Log.d(TAG, "onDestroy");
			setA2dpMediaBrowserService(null);
	mSession.release();		mSession.release();
	unregisterReceiver(mBtReceiver);		unregisterReceiver(mBtReceiver);
	super.onDestroy();		super.onDestroy();
	}		}


			/**
			* getA2dpMediaBrowserService()
			* Routine to get direct access to MediaBrowserService from within the same process.
			*/
			public static synchronized A2dpMediaBrowserService getA2dpMediaBrowserService() {
			if (sA2dpMediaBrowserService == null) {
			Log.w(TAG, "getA2dpMediaBrowserService(): service is NULL");
			return null;
			}
			if (DBG) Log.d(TAG, "getA2dpMediaBrowserService(): returning " + sA2dpMediaBrowserService);
			return sA2dpMediaBrowserService;
			}

			private static synchronized void setA2dpMediaBrowserService(A2dpMediaBrowserService instance) {
			if (DBG) Log.d(TAG, "setA2dpMediaBrowserService(): set to: " + instance);
			sA2dpMediaBrowserService = instance;
			}

	@Override		@Override
	public BrowserRoot onGetRoot(String clientPackageName, int clientUid, Bundle rootHints) {		public BrowserRoot onGetRoot(String clientPackageName, int clientUid, Bundle rootHints) {
			if (DBG) Log.d(TAG, "onGetRoot");
	return new BrowserRoot(BrowseTree.ROOT, null);		return new BrowserRoot(BrowseTree.ROOT, null);
	}		}

	@@ -210,17 +232,15 @@ public class A2dpMediaBrowserService extends MediaBrowserService {
	}		}

	if (DBG) Log.d(TAG, "onLoadChildren parentMediaId=" + parentMediaId);		if (DBG) Log.d(TAG, "onLoadChildren parentMediaId=" + parentMediaId);
	if (!mAvrcpCtrlSrvc.getChildren(mA2dpDevice, parentMediaId, 0, 0xff)) {		List<MediaItem> contents = mAvrcpCtrlSrvc.getContents(mA2dpDevice, parentMediaId);
	result.sendResult(Collections.emptyList());		if (contents == null) {
	return;
	}

	// Since we are using this thread from a binder thread we should make sure that
	// we synchronize against other such asynchronous calls.
	synchronized (this) {
	mParentIdToRequestMap.put(parentMediaId, result);		mParentIdToRequestMap.put(parentMediaId, result);
	}
	result.detach();		result.detach();
			} else {
			result.sendResult(contents);
			}

			return;
	}		}

	@Override		@Override
	@@ -532,16 +552,8 @@ public class A2dpMediaBrowserService extends MediaBrowserService {

	private void msgFolderList(Intent intent) {		private void msgFolderList(Intent intent) {
	// Parse the folder list for children list and id.		// Parse the folder list for children list and id.
	List<Parcelable> extraParcelableList =
	(ArrayList<Parcelable>) intent.getParcelableArrayListExtra(
	AvrcpControllerService.EXTRA_FOLDER_LIST);
	List<MediaItem> folderList = new ArrayList<MediaItem>();
	for (Parcelable p : extraParcelableList) {
	folderList.add((MediaItem) p);
	}

	String id = intent.getStringExtra(AvrcpControllerService.EXTRA_FOLDER_ID);		String id = intent.getStringExtra(AvrcpControllerService.EXTRA_FOLDER_ID);
	if (VDBG) Log.d(TAG, "Parent: " + id + " Folder list: " + folderList);		if (VDBG) Log.d(TAG, "Parent: " + id);
	synchronized (this) {		synchronized (this) {
	// If we have a result object then we should send the result back		// If we have a result object then we should send the result back
	// to client since it is blocking otherwise we may have gotten more items		// to client since it is blocking otherwise we may have gotten more items
	@@ -551,11 +563,23 @@ public class A2dpMediaBrowserService extends MediaBrowserService {
	Log.w(TAG, "Request no longer exists, notifying that children changed.");		Log.w(TAG, "Request no longer exists, notifying that children changed.");
	notifyChildrenChanged(id);		notifyChildrenChanged(id);
	} else {		} else {
			List<MediaItem> folderList = mAvrcpCtrlSrvc.getContents(mA2dpDevice, id);
	results.sendResult(folderList);		results.sendResult(folderList);
	}		}
	}		}
	}		}

			/**
			* processInternalEvent(Intent intent)
			* Routine to provide MediaBrowserService with content updates from within the same process.
			*/
			public void processInternalEvent(Intent intent) {
			String action = intent.getAction();
			if (AvrcpControllerService.ACTION_FOLDER_LIST.equals(action)) {
			mAvrcpCommandQueue.obtainMessage(MSG_FOLDER_LIST, intent).sendToTarget();
			}
			}

	private void msgDeviceBrowseDisconnect(BluetoothDevice device) {		private void msgDeviceBrowseDisconnect(BluetoothDevice device) {
	if (DBG) Log.d(TAG, "msgDeviceBrowseDisconnect device " + device);		if (DBG) Log.d(TAG, "msgDeviceBrowseDisconnect device " + device);
	// Disconnect only if mA2dpDevice is non null		// Disconnect only if mA2dpDevice is non null
	@@ -566,4 +590,5 @@ public class A2dpMediaBrowserService extends MediaBrowserService {
	}		}
	mBrowseConnected = false;		mBrowseConnected = false;
	}		}

	}		}

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

+7 −165

Original line number	Original line	Diff line number	Diff line
	@@ -172,8 +172,8 @@ public class AvrcpControllerService extends ProfileService {
	/* Folder navigation directions		/* Folder navigation directions
	* This is borrowed from AVRCP 1.6 spec and must be kept with same values		* This is borrowed from AVRCP 1.6 spec and must be kept with same values
	*/		*/
	public static final int FOLDER_NAVIGATION_DIRECTION_UP = 0x00;		public static final byte FOLDER_NAVIGATION_DIRECTION_UP = 0x00;
	public static final int FOLDER_NAVIGATION_DIRECTION_DOWN = 0x01;		public static final byte FOLDER_NAVIGATION_DIRECTION_DOWN = 0x01;

	/* Folder/Media Item scopes.		/* Folder/Media Item scopes.
	* Keep in sync with AVRCP 1.6 sec. 6.10.1		* Keep in sync with AVRCP 1.6 sec. 6.10.1
	@@ -398,77 +398,12 @@ public class AvrcpControllerService extends ProfileService {
	}		}

	/**		/**
	* Fetches the list of children for the parentID node.		* Retreive the contents of the directory from the associated bluetooth device.
	*
	* This function manages the overall tree for browsing structure.
	*
	* Arguments:
	* device - Device to browse content for.
	* parentMediaId - ID of the parent that we need to browse content for. Since most
	* of the players are database unware, fetching a root invalidates all the children.
	* start - number of item to start scanning from
	* items - number of items to fetch
	*/		*/
	public synchronized boolean getChildren(BluetoothDevice device, String parentMediaId, int start,		public synchronized List<MediaItem> getContents(BluetoothDevice device, String parentMediaId) {
	int items) {		return mAvrcpCtSm.getContents(parentMediaId);
	if (DBG) {
	Log.d(TAG, "getChildren device = " + device + " parent " + parentMediaId);
	}

	if (device == null) {
	Log.e(TAG, "getChildren device is null");
	return false;
	}

	if (!device.equals(mConnectedDevice)) {
	Log.e(TAG, "getChildren device " + device + " does not match " + mConnectedDevice);
	return false;
	}

	if (!mBrowseConnected) {
	Log.e(TAG, "getChildren browse not yet connected");
	return false;
	}

	if (!mAvrcpCtSm.isConnected()) {
	return false;
	}
	mAvrcpCtSm.getChildren(parentMediaId, start, items);
	return true;
	}

	public synchronized boolean getNowPlayingList(BluetoothDevice device, String id, int start,
	int items) {
	if (DBG) {
	Log.d(TAG, "getNowPlayingList device = " + device + " start = " + start + "items = "
	+ items);
	}

	if (device == null) {
	Log.e(TAG, "getNowPlayingList device is null");
	return false;
	}

	if (!device.equals(mConnectedDevice)) {
	Log.e(TAG,
	"getNowPlayingList device " + device + " does not match " + mConnectedDevice);
	return false;
	}		}
			/*
	if (!mBrowseConnected) {
	Log.e(TAG, "getNowPlayingList browse not yet connected");
	return false;
	}

	enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

	Message msg =
	mAvrcpCtSm.obtainMessage(AvrcpControllerStateMachine.MESSAGE_GET_NOW_PLAYING_LIST,
	start, items, id);
	mAvrcpCtSm.sendMessage(msg);
	return true;
	}

	public synchronized boolean getFolderList(BluetoothDevice device, String id, int start,		public synchronized boolean getFolderList(BluetoothDevice device, String id, int start,
	int items) {		int items) {
	if (DBG) {		if (DBG) {
	@@ -499,100 +434,7 @@ public class AvrcpControllerService extends ProfileService {
	mAvrcpCtSm.sendMessage(msg);		mAvrcpCtSm.sendMessage(msg);
	return true;		return true;
	}		}
			*/
	public synchronized boolean getPlayerList(BluetoothDevice device, int start, int items) {
	if (DBG) {
	Log.d(TAG,
	"getPlayerList device = " + device + " start = " + start + "items = " + items);
	}

	if (device == null) {
	Log.e(TAG, "getPlayerList device is null");
	return false;
	}

	if (!device.equals(mConnectedDevice)) {
	Log.e(TAG, "getPlayerList device " + device + " does not match " + mConnectedDevice);
	return false;
	}

	if (!mBrowseConnected) {
	Log.e(TAG, "getPlayerList browse not yet connected");
	return false;
	}

	enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

	Message msg =
	mAvrcpCtSm.obtainMessage(AvrcpControllerStateMachine.MESSAGE_GET_PLAYER_LIST, start,
	items);
	mAvrcpCtSm.sendMessage(msg);
	return true;
	}

	public synchronized boolean changeFolderPath(BluetoothDevice device, int direction, String uid,
	String fid) {
	if (DBG) {
	Log.d(TAG, "changeFolderPath device = " + device + " direction " + direction + " uid "
	+ uid);
	}

	if (device == null) {
	Log.e(TAG, "changeFolderPath device is null");
	return false;
	}

	if (!device.equals(mConnectedDevice)) {
	Log.e(TAG, "changeFolderPath device " + device + " does not match " + mConnectedDevice);
	return false;
	}

	if (!mBrowseConnected) {
	Log.e(TAG, "changeFolderPath browse not yet connected");
	return false;
	}

	enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

	Bundle b = new Bundle();
	b.putString(EXTRA_FOLDER_ID, fid);
	b.putString(EXTRA_FOLDER_BT_ID, uid);
	Message msg =
	mAvrcpCtSm.obtainMessage(AvrcpControllerStateMachine.MESSAGE_CHANGE_FOLDER_PATH,
	direction, 0, b);
	mAvrcpCtSm.sendMessage(msg);
	return true;
	}

	public synchronized boolean setBrowsedPlayer(BluetoothDevice device, int id, String fid) {
	if (DBG) {
	Log.d(TAG, "setBrowsedPlayer device = " + device + " id" + id + " fid " + fid);
	}

	if (device == null) {
	Log.e(TAG, "setBrowsedPlayer device is null");
	return false;
	}

	if (!device.equals(mConnectedDevice)) {
	Log.e(TAG, "changeFolderPath device " + device + " does not match " + mConnectedDevice);
	return false;
	}

	if (!mBrowseConnected) {
	Log.e(TAG, "setBrowsedPlayer browse not yet connected");
	return false;
	}

	enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

	Message msg =
	mAvrcpCtSm.obtainMessage(AvrcpControllerStateMachine.MESSAGE_SET_BROWSED_PLAYER, id,
	0, fid);
	mAvrcpCtSm.sendMessage(msg);
	return true;
	}

	public synchronized void fetchAttrAndPlayItem(BluetoothDevice device, String uid) {		public synchronized void fetchAttrAndPlayItem(BluetoothDevice device, String uid) {
	if (DBG) {		if (DBG) {
	Log.d(TAG, "fetchAttrAndPlayItem device = " + device + " uid " + uid);		Log.d(TAG, "fetchAttrAndPlayItem device = " + device + " uid " + uid);

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

+167 −561

File changed.

Preview size limit exceeded, changes collapsed.

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

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,8 @@ import java.util.Arrays;
	*/		*/
	class AvrcpPlayer {		class AvrcpPlayer {
	private static final String TAG = "AvrcpPlayer";		private static final String TAG = "AvrcpPlayer";
	private static final boolean DBG = true;		private static final boolean DBG = false;
			private static final boolean VDBG = false;

	public static final int INVALID_ID = -1;		public static final int INVALID_ID = -1;

	@@ -120,8 +121,15 @@ class AvrcpPlayer {
	.setActions(mAvailableActions).build();		.setActions(mAvailableActions).build();
	}		}

	public synchronized void updateCurrentTrack(TrackInfo update) {		public synchronized boolean updateCurrentTrack(TrackInfo update) {
			if (update != null && mCurrentTrack != null
			&& update.toString().equals(mCurrentTrack.toString())) {
			if (DBG) Log.d(TAG, "Update same as original");
			return false;
			}
			if (VDBG) Log.d(TAG, "Track Changed Was:" + mCurrentTrack + "now " + update);
	mCurrentTrack = update;		mCurrentTrack = update;
			return true;
	}		}

	public synchronized TrackInfo getCurrentTrack() {		public synchronized TrackInfo getCurrentTrack() {

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

+183 −110

File changed.

Preview size limit exceeded, changes collapsed.