Merge "BluetoothInCallService: check the parent ID to disconnect a conference call" (d50b8055) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/telephony/BluetoothInCallService.java

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -726,11 +726,14 @@ public class BluetoothInCallService extends InCallService {
	return false;		return false;
	}		}
	if (!mCallInfo.isNullCall(activeCall)) {		if (!mCallInfo.isNullCall(activeCall)) {
			BluetoothCall conferenceCall = getBluetoothCallById(activeCall.getParentId());
			if (!mCallInfo.isNullCall(conferenceCall)
			&& conferenceCall.getState() == Call.STATE_ACTIVE) {
			Log.i(TAG, "CHLD: disconnect conference call");
			conferenceCall.disconnect();
			} else {
	activeCall.disconnect();		activeCall.disconnect();
	if (!mCallInfo.isNullCall(ringingCall)) {
	ringingCall.answer(VideoProfile.STATE_AUDIO_ONLY);
	}		}
	return true;
	}		}
	if (!mCallInfo.isNullCall(ringingCall)) {		if (!mCallInfo.isNullCall(ringingCall)) {
	ringingCall.answer(ringingCall.getVideoState());		ringingCall.answer(ringingCall.getVideoState());