Refactor A2dpSink and AvrcpController (6b491bdf) · Commits · e / os / android_packages_apps_Bluetooth

jni/com_android_bluetooth_a2dp_sink.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -231,7 +231,7 @@ static JNINativeMethod sMethods[] = {

	int register_com_android_bluetooth_a2dp_sink(JNIEnv* env) {		int register_com_android_bluetooth_a2dp_sink(JNIEnv* env) {
	return jniRegisterNativeMethods(		return jniRegisterNativeMethods(
	env, "com/android/bluetooth/a2dpsink/A2dpSinkStateMachine", sMethods,		env, "com/android/bluetooth/a2dpsink/A2dpSinkService", sMethods,
	NELEM(sMethods));		NELEM(sMethods));
	}		}
	}		}

jni/com_android_bluetooth_avrcp_controller.cpp

+111 −79

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ static void btavrcp_passthrough_response_callback(const RawAddress& bd_addr,
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to new jbyteArray bd addr for passthrough response");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -109,7 +109,7 @@ static void btavrcp_connection_state_callback(bool rc_connect, bool br_connect,
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to new jbyteArray bd addr for connection state");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -134,7 +134,7 @@ static void btavrcp_get_rcfeatures_callback(const RawAddress& bd_addr,
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to new jbyteArray bd addr ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -158,7 +158,7 @@ static void btavrcp_setplayerapplicationsetting_rsp_callback(
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to new jbyteArray bd addr ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -184,7 +184,7 @@ static void btavrcp_playerapplicationsetting_callback(
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to new jbyteArray bd addr ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}
	sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),		sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
	@@ -202,7 +202,7 @@ static void btavrcp_playerapplicationsetting_callback(
	ScopedLocalRef<jbyteArray> playerattribs(		ScopedLocalRef<jbyteArray> playerattribs(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(arraylen));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(arraylen));
	if (!playerattribs.get()) {		if (!playerattribs.get()) {
	ALOGE("Fail to new jbyteArray playerattribs ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -236,7 +236,7 @@ static void btavrcp_playerapplicationsetting_changed_callback(
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to get new array ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}
	sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),		sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
	@@ -279,7 +279,7 @@ static void btavrcp_set_abs_vol_cmd_callback(const RawAddress& bd_addr,
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to get new array ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -303,7 +303,7 @@ static void btavrcp_register_notification_absvol_callback(
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to get new array ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -333,7 +333,7 @@ static void btavrcp_track_changed_callback(const RawAddress& bd_addr,
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to get new array ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}

	@@ -388,7 +388,7 @@ static void btavrcp_play_position_changed_callback(const RawAddress& bd_addr,
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to get new array ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}
	sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),		sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
	@@ -411,7 +411,7 @@ static void btavrcp_play_status_changed_callback(
	ScopedLocalRef<jbyteArray> addr(		ScopedLocalRef<jbyteArray> addr(
	sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));		sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
	if (!addr.get()) {		if (!addr.get()) {
	ALOGE("Fail to get new array ");		ALOGE("%s: Failed to allocate a new byte array", __func__);
	return;		return;
	}		}
	sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),		sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
	@@ -436,6 +436,16 @@ static void btavrcp_get_folder_items_callback(
	return;		return;
	}		}

			ScopedLocalRef<jbyteArray> addr(
			sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
			if (!addr.get()) {
			ALOGE("%s: Failed to allocate a new byte array", __func__);
			return;
			}

			sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
			(jbyte*)&bd_addr.address);

	// Inspect if the first element is a folder/item or player listing. They are		// Inspect if the first element is a folder/item or player listing. They are
	// always exclusive.		// always exclusive.
	bool isPlayerListing =		bool isPlayerListing =
	@@ -468,17 +478,7 @@ static void btavrcp_get_folder_items_callback(
	return;		return;
	}		}
	// Parse UID		// Parse UID
	ScopedLocalRef<jbyteArray> uidByteArray(		long long uid = (long long)item->media.uid;
	sCallbackEnv.get(),
	sCallbackEnv->NewByteArray(sizeof(uint8_t) * BTRC_UID_SIZE));
	if (!uidByteArray.get()) {
	ALOGE("%s can't allocate uid array!", __func__);
	return;
	}
	sCallbackEnv->SetByteArrayRegion(uidByteArray.get(), 0,
	BTRC_UID_SIZE * sizeof(uint8_t),
	(jbyte*)item->media.uid);

	// Parse Attrs		// Parse Attrs
	ScopedLocalRef<jintArray> attrIdArray(		ScopedLocalRef<jintArray> attrIdArray(
	sCallbackEnv.get(),		sCallbackEnv.get(),
	@@ -504,10 +504,6 @@ static void btavrcp_get_folder_items_callback(
	ScopedLocalRef<jstring> attrValStr(		ScopedLocalRef<jstring> attrValStr(
	sCallbackEnv.get(),		sCallbackEnv.get(),
	sCallbackEnv->NewStringUTF((char*)(item->media.p_attrs[j].text)));		sCallbackEnv->NewStringUTF((char*)(item->media.p_attrs[j].text)));
	if (!uidByteArray.get()) {
	ALOGE("%s can't allocate uid array!", __func__);
	return;
	}
	sCallbackEnv->SetObjectArrayElement(attrValArray.get(), j,		sCallbackEnv->SetObjectArrayElement(attrValArray.get(), j,
	attrValStr.get());		attrValStr.get());
	}		}
	@@ -515,9 +511,9 @@ static void btavrcp_get_folder_items_callback(
	ScopedLocalRef<jobject> mediaObj(		ScopedLocalRef<jobject> mediaObj(
	sCallbackEnv.get(),		sCallbackEnv.get(),
	(jobject)sCallbackEnv->CallObjectMethod(		(jobject)sCallbackEnv->CallObjectMethod(
	sCallbacksObj, method_createFromNativeMediaItem,		sCallbacksObj, method_createFromNativeMediaItem, uid,
	uidByteArray.get(), (jint)item->media.type, mediaName.get(),		(jint)item->media.type, mediaName.get(), attrIdArray.get(),
	attrIdArray.get(), attrValArray.get()));		attrValArray.get()));
	if (!mediaObj.get()) {		if (!mediaObj.get()) {
	ALOGE("%s failed to creae MediaItem for type ITEM_MEDIA", __func__);		ALOGE("%s failed to creae MediaItem for type ITEM_MEDIA", __func__);
	return;		return;
	@@ -536,22 +532,12 @@ static void btavrcp_get_folder_items_callback(
	return;		return;
	}		}
	// Parse UID		// Parse UID
	ScopedLocalRef<jbyteArray> uidByteArray(		long long uid = (long long)item->folder.uid;
	sCallbackEnv.get(),
	sCallbackEnv->NewByteArray(sizeof(uint8_t) * BTRC_UID_SIZE));
	if (!uidByteArray.get()) {
	ALOGE("%s can't allocate uid array!", __func__);
	return;
	}
	sCallbackEnv->SetByteArrayRegion(uidByteArray.get(), 0,
	BTRC_UID_SIZE * sizeof(uint8_t),
	(jbyte*)item->folder.uid);

	ScopedLocalRef<jobject> folderObj(		ScopedLocalRef<jobject> folderObj(
	sCallbackEnv.get(),		sCallbackEnv.get(),
	(jobject)sCallbackEnv->CallObjectMethod(		(jobject)sCallbackEnv->CallObjectMethod(
	sCallbacksObj, method_createFromNativeFolderItem,		sCallbacksObj, method_createFromNativeFolderItem, uid,
	uidByteArray.get(), (jint)item->folder.type, folderName.get(),		(jint)item->folder.type, folderName.get(),
	(jint)item->folder.playable));		(jint)item->folder.playable));
	if (!folderObj.get()) {		if (!folderObj.get()) {
	ALOGE("%s failed to create MediaItem for type ITEM_FOLDER", __func__);		ALOGE("%s failed to create MediaItem for type ITEM_FOLDER", __func__);
	@@ -609,10 +595,10 @@ static void btavrcp_get_folder_items_callback(

	if (isPlayerListing) {		if (isPlayerListing) {
	sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleGetPlayerItemsRsp,		sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleGetPlayerItemsRsp,
	itemArray.get());		addr.get(), itemArray.get());
	} else {		} else {
	sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleGetFolderItemsRsp,		sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleGetFolderItemsRsp,
	status, itemArray.get());		addr.get(), status, itemArray.get());
	}		}
	}		}

	@@ -626,9 +612,18 @@ static void btavrcp_change_path_callback(const RawAddress& bd_addr,
	ALOGE("%s: sCallbacksObj is null", __func__);		ALOGE("%s: sCallbacksObj is null", __func__);
	return;		return;
	}		}
			ScopedLocalRef<jbyteArray> addr(
			sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
			if (!addr.get()) {
			ALOGE("%s: Failed to allocate a new byte array", __func__);
			return;
			}

			sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
			(jbyte*)&bd_addr.address);

	sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleChangeFolderRsp,		sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleChangeFolderRsp,
	(jint)count);		addr.get(), (jint)count);
	}		}

	static void btavrcp_set_browsed_player_callback(const RawAddress& bd_addr,		static void btavrcp_set_browsed_player_callback(const RawAddress& bd_addr,
	@@ -642,9 +637,18 @@ static void btavrcp_set_browsed_player_callback(const RawAddress& bd_addr,
	ALOGE("%s: sCallbacksObj is null", __func__);		ALOGE("%s: sCallbacksObj is null", __func__);
	return;		return;
	}		}
			ScopedLocalRef<jbyteArray> addr(
			sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
			if (!addr.get()) {
			ALOGE("%s: Failed to allocate a new byte array", __func__);
			return;
			}

			sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
			(jbyte*)&bd_addr.address);

	sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleSetBrowsedPlayerRsp,		sCallbackEnv->CallVoidMethod(sCallbacksObj, method_handleSetBrowsedPlayerRsp,
	(jint)num_items, (jint)depth);		addr.get(), (jint)num_items, (jint)depth);
	}		}

	static void btavrcp_set_addressed_player_callback(const RawAddress& bd_addr,		static void btavrcp_set_addressed_player_callback(const RawAddress& bd_addr,
	@@ -657,9 +661,19 @@ static void btavrcp_set_addressed_player_callback(const RawAddress& bd_addr,
	ALOGE("%s: sCallbacksObj is null", __func__);		ALOGE("%s: sCallbacksObj is null", __func__);
	return;		return;
	}		}
			ScopedLocalRef<jbyteArray> addr(
			sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
			if (!addr.get()) {
			ALOGE("%s: Failed to allocate a new byte array", __func__);
			return;
			}

	sCallbackEnv->CallVoidMethod(		sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
	sCallbacksObj, method_handleSetAddressedPlayerRsp, (jint)status);		(jbyte*)&bd_addr.address);

			sCallbackEnv->CallVoidMethod(sCallbacksObj,
			method_handleSetAddressedPlayerRsp, addr.get(),
			(jint)status);
	}		}

	static void btavrcp_addressed_player_changed_callback(const RawAddress& bd_addr,		static void btavrcp_addressed_player_changed_callback(const RawAddress& bd_addr,
	@@ -672,9 +686,18 @@ static void btavrcp_addressed_player_changed_callback(const RawAddress& bd_addr,
	ALOGE("%s: sCallbacksObj is null", __func__);		ALOGE("%s: sCallbacksObj is null", __func__);
	return;		return;
	}		}
			ScopedLocalRef<jbyteArray> addr(
			sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
			if (!addr.get()) {
			ALOGE("%s: Failed to allocate a new byte array", __func__);
			return;
			}

	sCallbackEnv->CallVoidMethod(sCallbacksObj,		sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
	method_handleAddressedPlayerChanged, (jint)id);		(jbyte*)&bd_addr.address);

			sCallbackEnv->CallVoidMethod(
			sCallbacksObj, method_handleAddressedPlayerChanged, addr.get(), (jint)id);
	}		}

	static void btavrcp_now_playing_content_changed_callback(		static void btavrcp_now_playing_content_changed_callback(
	@@ -683,9 +706,18 @@ static void btavrcp_now_playing_content_changed_callback(

	CallbackEnv sCallbackEnv(__func__);		CallbackEnv sCallbackEnv(__func__);
	if (!sCallbackEnv.valid()) return;		if (!sCallbackEnv.valid()) return;
			ScopedLocalRef<jbyteArray> addr(
			sCallbackEnv.get(), sCallbackEnv->NewByteArray(sizeof(RawAddress)));
			if (!addr.get()) {
			ALOGE("%s: Failed to allocate a new byte array", __func__);
			return;
			}

	sCallbackEnv->CallVoidMethod(sCallbacksObj,		sCallbackEnv->SetByteArrayRegion(addr.get(), 0, sizeof(RawAddress),
	method_handleNowPlayingContentChanged);		(jbyte*)&bd_addr.address);

			sCallbackEnv->CallVoidMethod(
			sCallbacksObj, method_handleNowPlayingContentChanged, addr.get());
	}		}

	static btrc_ctrl_callbacks_t sBluetoothAvrcpCallbacks = {		static btrc_ctrl_callbacks_t sBluetoothAvrcpCallbacks = {
	@@ -747,32 +779,32 @@ static void classInitNative(JNIEnv* env, jclass clazz) {

	method_handleGetFolderItemsRsp =		method_handleGetFolderItemsRsp =
	env->GetMethodID(clazz, "handleGetFolderItemsRsp",		env->GetMethodID(clazz, "handleGetFolderItemsRsp",
	"(I[Landroid/media/browse/MediaBrowser$MediaItem;)V");		"([BI[Landroid/media/browse/MediaBrowser$MediaItem;)V");
	method_handleGetPlayerItemsRsp = env->GetMethodID(		method_handleGetPlayerItemsRsp = env->GetMethodID(
	clazz, "handleGetPlayerItemsRsp",		clazz, "handleGetPlayerItemsRsp",
	"([Lcom/android/bluetooth/avrcpcontroller/AvrcpPlayer;)V");		"([B[Lcom/android/bluetooth/avrcpcontroller/AvrcpPlayer;)V");

	method_createFromNativeMediaItem =		method_createFromNativeMediaItem =
	env->GetMethodID(clazz, "createFromNativeMediaItem",		env->GetMethodID(clazz, "createFromNativeMediaItem",
	"([BILjava/lang/String;[I[Ljava/lang/String;)Landroid/"		"(JILjava/lang/String;[I[Ljava/lang/String;)Landroid/"
	"media/browse/MediaBrowser$MediaItem;");		"media/browse/MediaBrowser$MediaItem;");
	method_createFromNativeFolderItem = env->GetMethodID(		method_createFromNativeFolderItem = env->GetMethodID(
	clazz, "createFromNativeFolderItem",		clazz, "createFromNativeFolderItem",
	"([BILjava/lang/String;I)Landroid/media/browse/MediaBrowser$MediaItem;");		"(JILjava/lang/String;I)Landroid/media/browse/MediaBrowser$MediaItem;");
	method_createFromNativePlayerItem =		method_createFromNativePlayerItem =
	env->GetMethodID(clazz, "createFromNativePlayerItem",		env->GetMethodID(clazz, "createFromNativePlayerItem",
	"(ILjava/lang/String;[BII)Lcom/android/bluetooth/"		"(ILjava/lang/String;[BII)Lcom/android/bluetooth/"
	"avrcpcontroller/AvrcpPlayer;");		"avrcpcontroller/AvrcpPlayer;");
	method_handleChangeFolderRsp =		method_handleChangeFolderRsp =
	env->GetMethodID(clazz, "handleChangeFolderRsp", "(I)V");		env->GetMethodID(clazz, "handleChangeFolderRsp", "([BI)V");
	method_handleSetBrowsedPlayerRsp =		method_handleSetBrowsedPlayerRsp =
	env->GetMethodID(clazz, "handleSetBrowsedPlayerRsp", "(II)V");		env->GetMethodID(clazz, "handleSetBrowsedPlayerRsp", "([BII)V");
	method_handleSetAddressedPlayerRsp =		method_handleSetAddressedPlayerRsp =
	env->GetMethodID(clazz, "handleSetAddressedPlayerRsp", "(I)V");		env->GetMethodID(clazz, "handleSetAddressedPlayerRsp", "([BI)V");
	method_handleAddressedPlayerChanged =		method_handleAddressedPlayerChanged =
	env->GetMethodID(clazz, "handleAddressedPlayerChanged", "(I)V");		env->GetMethodID(clazz, "handleAddressedPlayerChanged", "([BI)V");
	method_handleNowPlayingContentChanged =		method_handleNowPlayingContentChanged =
	env->GetMethodID(clazz, "handleNowPlayingContentChanged", "()V");		env->GetMethodID(clazz, "handleNowPlayingContentChanged", "([B)V");

	ALOGI("%s: succeeds", __func__);		ALOGI("%s: succeeds", __func__);
	}		}
	@@ -1081,7 +1113,7 @@ static void getPlayerListNative(JNIEnv* env, jobject object, jbyteArray address,

	static void changeFolderPathNative(JNIEnv* env, jobject object,		static void changeFolderPathNative(JNIEnv* env, jobject object,
	jbyteArray address, jbyte direction,		jbyteArray address, jbyte direction,
	jbyteArray uidarr) {		jlong uid) {
	if (!sBluetoothAvrcpInterface) return;		if (!sBluetoothAvrcpInterface) return;
	jbyte* addr = env->GetByteArrayElements(address, NULL);		jbyte* addr = env->GetByteArrayElements(address, NULL);
	if (!addr) {		if (!addr) {
	@@ -1089,22 +1121,22 @@ static void changeFolderPathNative(JNIEnv* env, jobject object,
	return;		return;
	}		}

	jbyte* uid = env->GetByteArrayElements(uidarr, NULL);		// jbyte* uid = env->GetByteArrayElements(uidarr, NULL);
	if (!uid) {		// if (!uid) {
	jniThrowIOException(env, EINVAL);		// jniThrowIOException(env, EINVAL);
	return;		// return;
	}		//}

	ALOGI("%s: sBluetoothAvrcpInterface: %p", __func__, sBluetoothAvrcpInterface);		ALOGI("%s: sBluetoothAvrcpInterface: %p", __func__, sBluetoothAvrcpInterface);
	RawAddress rawAddress;		RawAddress rawAddress;
	rawAddress.FromOctets((uint8_t*)addr);		rawAddress.FromOctets((uint8_t*)addr);

	bt_status_t status = sBluetoothAvrcpInterface->change_folder_path_cmd(		bt_status_t status = sBluetoothAvrcpInterface->change_folder_path_cmd(
	rawAddress, (uint8_t)direction, (uint8_t*)uid);		rawAddress, (uint8_t)direction, (uint8_t*)&uid);
	if (status != BT_STATUS_SUCCESS) {		if (status != BT_STATUS_SUCCESS) {
	ALOGE("Failed sending changeFolderPathNative command, status: %d", status);		ALOGE("Failed sending changeFolderPathNative command, status: %d", status);
	}		}
	env->ReleaseByteArrayElements(address, addr, 0);		// env->ReleaseByteArrayElements(address, addr, 0);
	}		}

	static void setBrowsedPlayerNative(JNIEnv* env, jobject object,		static void setBrowsedPlayerNative(JNIEnv* env, jobject object,
	@@ -1149,7 +1181,7 @@ static void setAddressedPlayerNative(JNIEnv* env, jobject object,
	}		}

	static void playItemNative(JNIEnv* env, jobject object, jbyteArray address,		static void playItemNative(JNIEnv* env, jobject object, jbyteArray address,
	jbyte scope, jbyteArray uidArr, jint uidCounter) {		jbyte scope, jlong uid, jint uidCounter) {
	if (!sBluetoothAvrcpInterface) return;		if (!sBluetoothAvrcpInterface) return;
	jbyte* addr = env->GetByteArrayElements(address, NULL);		jbyte* addr = env->GetByteArrayElements(address, NULL);
	if (!addr) {		if (!addr) {
	@@ -1157,17 +1189,17 @@ static void playItemNative(JNIEnv* env, jobject object, jbyteArray address,
	return;		return;
	}		}

	jbyte* uid = env->GetByteArrayElements(uidArr, NULL);		// jbyte* uid = env->GetByteArrayElements(uidArr, NULL);
	if (!uid) {		// if (!uid) {
	jniThrowIOException(env, EINVAL);		// jniThrowIOException(env, EINVAL);
	return;		// return;
	}		// }
	RawAddress rawAddress;		RawAddress rawAddress;
	rawAddress.FromOctets((uint8_t*)addr);		rawAddress.FromOctets((uint8_t*)addr);

	ALOGI("%s: sBluetoothAvrcpInterface: %p", __func__, sBluetoothAvrcpInterface);		ALOGI("%s: sBluetoothAvrcpInterface: %p", __func__, sBluetoothAvrcpInterface);
	bt_status_t status = sBluetoothAvrcpInterface->play_item_cmd(		bt_status_t status = sBluetoothAvrcpInterface->play_item_cmd(
	rawAddress, (uint8_t)scope, (uint8_t*)uid, (uint16_t)uidCounter);		rawAddress, (uint8_t)scope, (uint8_t*)&uid, (uint16_t)uidCounter);
	if (status != BT_STATUS_SUCCESS) {		if (status != BT_STATUS_SUCCESS) {
	ALOGE("Failed sending playItemNative command, status: %d", status);		ALOGE("Failed sending playItemNative command, status: %d", status);
	}		}
	@@ -1191,8 +1223,8 @@ static JNINativeMethod sMethods[] = {
	{"getNowPlayingListNative", "([BII)V", (void*)getNowPlayingListNative},		{"getNowPlayingListNative", "([BII)V", (void*)getNowPlayingListNative},
	{"getFolderListNative", "([BII)V", (void*)getFolderListNative},		{"getFolderListNative", "([BII)V", (void*)getFolderListNative},
	{"getPlayerListNative", "([BII)V", (void*)getPlayerListNative},		{"getPlayerListNative", "([BII)V", (void*)getPlayerListNative},
	{"changeFolderPathNative", "([BB[B)V", (void*)changeFolderPathNative},		{"changeFolderPathNative", "([BBJ)V", (void*)changeFolderPathNative},
	{"playItemNative", "([BB[BI)V", (void*)playItemNative},		{"playItemNative", "([BBJI)V", (void*)playItemNative},
	{"setBrowsedPlayerNative", "([BI)V", (void*)setBrowsedPlayerNative},		{"setBrowsedPlayerNative", "([BI)V", (void*)setBrowsedPlayerNative},
	{"setAddressedPlayerNative", "([BI)V", (void*)setAddressedPlayerNative},		{"setAddressedPlayerNative", "([BI)V", (void*)setAddressedPlayerNative},
	};		};