Merge branch 'LA.BF.1.1_rb1.16' of... (73b826f8) · Commits · e / os / android_packages_apps_Bluetooth

jni/com_android_bluetooth_avrcp.cpp

+17 −5

Original line number	Diff line number	Diff line
		@@ -304,8 +304,8 @@ static void btavrcp_volume_change_callback(uint8_t volume, uint8_t ctype) {

		static void btavrcp_get_folder_items_callback(btrc_browse_folderitem_t scope ,
		btrc_getfolderitem_t *param) {
		jint start = param->start_item;
		jint end = param->end_item;
		jlong start = param->start_item;
		jlong end = param->end_item;
		jint size = param->size;
		jint num_attr = param->attr_count;
		jintArray attrs;
		@@ -516,7 +516,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
		env->GetMethodID(clazz, "setAddressedPlayer", "(I)V");
		//getFolderItems: attributes to pass: Scope, Start, End, Attr Cnt
		method_getFolderItems =
		env->GetMethodID(clazz, "getFolderItems", "(BIIII[I)V");
		env->GetMethodID(clazz, "getFolderItems", "(BJJII[I)V");
		method_setBrowsedPlayer =
		env->GetMethodID(clazz, "setBrowsedPlayer", "(I)V");
		method_changePath =
		@@ -1081,7 +1081,7 @@ static jboolean registerNotificationRspNowPlayingContentChangedNative(JNIEnv *en
		}

		static jboolean getFolderItemsRspNative(JNIEnv *env, jobject object, jbyte statusCode,
		jint numItems, jintArray itemType, jlongArray uid, jintArray type,
		jlong numItems, jintArray itemType, jlongArray uid, jintArray type,
		jbyteArray playable, jobjectArray displayName, jbyteArray numAtt,
		jobjectArray attValues, jintArray attIds) {
		bt_status_t status = BT_STATUS_SUCCESS;
		@@ -1158,6 +1158,10 @@ static jboolean getFolderItemsRspNative(JNIEnv *env, jobject object, jbyte statu
		param.p_item_list[count].u.folder.playable = playableElements[count];

		text = (jstring) env->GetObjectArrayElement(displayName, count);
		if (text == NULL) {
		ALOGE("getFolderItemsRspNative: App string is NULL, bail out");
		break;
		}
		utfStringLength = env->GetStringUTFLength(text);
		if (!utfStringLength) {
		ALOGE("getFolderItemsRspNative: GetStringUTFLength return NULL");
		@@ -1186,6 +1190,10 @@ static jboolean getFolderItemsRspNative(JNIEnv *env, jobject object, jbyte statu
		param.p_item_list[count].u.media.type = (uint8_t)typeElements[count];
		ALOGI("getFolderItemsRspNative: type: %d", param.p_item_list[count].u.folder.type);
		text = (jstring) env->GetObjectArrayElement(displayName, count);
		if (text == NULL) {
		ALOGE("getFolderItemsRspNative: App string is NULL, bail out");
		break;
		}
		utfStringLength = env->GetStringUTFLength(text);
		if (!utfStringLength) {
		ALOGE("getFolderItemsRspNative: GetStringUTFLength return NULL");
		@@ -1213,6 +1221,10 @@ static jboolean getFolderItemsRspNative(JNIEnv *env, jobject object, jbyte statu

		for (int i = 0; i < numAttElements[count]; i++) {
		text = (jstring) env->GetObjectArrayElement(attValues, (7 * count) + i);
		if (text == NULL) {
		ALOGE("getFolderItemsRspNative: Attribute string is NULL, continue to next");
		continue;
		}
		utfStringLength = env->GetStringUTFLength(text);
		if (!utfStringLength) {
		ALOGE("getFolderItemsRspNative: GetStringUTFLength return NULL");
		@@ -1594,7 +1606,7 @@ static JNINativeMethod sMethods[] = {
		{"changePathRspNative", "(IJ)Z", (void *) changePathRspNative},
		{"playItemRspNative", "(I)Z", (void *) playItemRspNative},
		{"getItemAttrRspNative", "(B[I[Ljava/lang/String;)Z", (void *) getItemAttrRspNative},
		{"getFolderItemsRspNative", "(BI[I[J[I[B[Ljava/lang/String;[B[Ljava/lang/String;[I)Z",
		{"getFolderItemsRspNative", "(BJ[I[J[I[B[Ljava/lang/String;[B[Ljava/lang/String;[I)Z",
		(void *) getFolderItemsRspNative},
		};

src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -619,7 +619,7 @@ final class A2dpSinkStateMachine extends StateMachine {
		mPlayingDevice = null;
		broadcastAudioState(device, BluetoothA2dpSink.STATE_NOT_PLAYING,
		BluetoothA2dpSink.STATE_PLAYING);
		if ((mAudioFocusAcquired == AUDIO_FOCUS_LOSS_TRANSIENT) \|\|
		if ((mAudioFocusAcquired == AUDIO_FOCUS_LOSS_TRANSIENT) &&
		(state == AUDIO_STATE_REMOTE_SUSPEND)) {
		log(" Dont't Loose audiofocus in case of suspend ");
		break;

src/com/android/bluetooth/avrcp/Avrcp.java

+247 −118

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/bluetooth/btservice/AdapterService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1595,9 +1595,9 @@ public class AdapterService extends Service {
		void setProfileAutoConnectionPriority (BluetoothDevice device, int profileId){
		if (profileId == BluetoothProfile.HEADSET) {
		HeadsetService hsService = HeadsetService.getHeadsetService();
		List<BluetoothDevice> deviceList = hsService.getConnectedDevices();
		if ((hsService != null) &&
		(BluetoothProfile.PRIORITY_AUTO_CONNECT != hsService.getPriority(device))){
		List<BluetoothDevice> deviceList = hsService.getConnectedDevices();
		adjustOtherHeadsetPriorities(hsService, deviceList);
		hsService.setPriority(device,BluetoothProfile.PRIORITY_AUTO_CONNECT);
		}

src/com/android/bluetooth/btservice/AdapterState.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -341,6 +341,8 @@ final class AdapterState extends StateMachine {
		mPendingCommandState.setTurningOff(false);
		transitionTo(mOffState);
		notifyAdapterStateChange(BluetoothAdapter.STATE_OFF);
		errorLog("STOP_TIMEOUT:Killing the process to force a restart as part cleanup");
		android.os.Process.killProcess(android.os.Process.myPid());
		break;
		case DISABLE_TIMEOUT:
		if (DBG) Log.d(TAG,"CURRENT_STATE=PENDING, MESSAGE = DISABLE_TIMEOUT, isTurningOn=" + isTurningOn + ", isTurningOff=" + isTurningOff);