Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b50dc7c9 authored by Antoine SOULIER's avatar Antoine SOULIER
Browse files

HCI Vendor specific hook to GD/HAL 

Bug: 360924438
Test: mma -j32
Flag: com.android.bluetooth.flags.hci_vendor_specific_extension
Change-Id: I58f1d36df797d33810ea90c58648eac03af8b966
parent 8b0522f3

system/btif/src/btif_hci_vs.cc

+8 −4
Original line number Diff line number Diff line
@@ -42,13 +42,15 @@ static void CommandStatusOrCompleteCallback(BluetoothHciVendorSpecificCallbacks* 
    auto view = std::get<CommandStatusView>(status_or_complete);

    auto ocf = static_cast<uint16_t>(view.GetCommandOpCode()) & 0x3ff;

    auto status = static_cast<uint8_t>(view.GetStatus());

    callbacks->commandStatusDelivery(ocf, status, cookie);

    do_in_jni_thread(base::BindOnce(&BluetoothHciVendorSpecificCallbacks::onCommandStatus,

                                    base::Unretained(callbacks), ocf, status, cookie));



  } else if (std::holds_alternative<CommandCompleteView>(status_or_complete)) {

    auto view = std::get<CommandCompleteView>(status_or_complete);

    auto ocf = static_cast<uint16_t>(view.GetCommandOpCode()) & 0x3ff;

    std::vector<uint8_t> return_parameters(view.GetPayload().begin(), view.GetPayload().end());

    callbacks->commandCompleteDelivery(ocf, return_parameters, cookie);

    do_in_jni_thread(base::BindOnce(&BluetoothHciVendorSpecificCallbacks::onCommandComplete,

                                    base::Unretained(callbacks), ocf, return_parameters, cookie));

  }

}
@@ -61,7 +63,8 @@ static void EventCallback(BluetoothHciVendorSpecificCallbacks* callbacks, 
  }



  std::vector<uint8_t> data(view.GetPayload().begin(), view.GetPayload().end());

  callbacks->eventDelivery(code, data);

  do_in_jni_thread(base::BindOnce(&BluetoothHciVendorSpecificCallbacks::onEvent,

                                  base::Unretained(callbacks), code, data));

}



class BluetoothHciVendorSpecificInterfaceImpl
@@ -92,7 +95,8 @@ class BluetoothHciVendorSpecificInterfaceImpl 
    auto op_code = static_cast<OpCode>((ogf_vendor_specific << 10) | ocf);



    shim::GetHciLayer()->EnqueueCommand(

            hci::CommandBuilder::Create(op_code, std::make_unique<packet::RawBuilder>(parameters)),

            hci::CommandBuilder::Create(

                    op_code, std::make_unique<packet::RawBuilder>(std::move(parameters))),

            get_main()->BindOnce(CommandStatusOrCompleteCallback, callbacks_, std::move(cookie)));

  }