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

Commit 189a0770 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge changes I5c8ad512,Idce102cd 

* changes:
  Support Bluetooth HAL 1.1 in GD
  Rust HAL: Store header size as constant rather than enum
parents c96283da 33692ce5

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ cc_test { 
    shared_libs: [

        "libaaudio",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.hardware.bluetooth.a2dp@1.0",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

system/build/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ fluoride_defaults { 
        android: {

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libhidlbase",

                "libutils",

                "libcutils",

system/gd/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ cc_defaults { 
            ],

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "android.system.suspend.control-V1-ndk",

                "libbinder_ndk",

                "libcutils",
@@ -254,6 +255,7 @@ cc_binary { 
        android: {

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libhidlbase",

                "libutils",

                "libcutils",
@@ -301,6 +303,7 @@ cc_test { 
            ],

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libhidlbase",

                "libutils",

                "libcutils",
@@ -386,6 +389,7 @@ cc_test { 
        android: {

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libhidlbase",

                "libutils",

                "libcutils",
@@ -427,6 +431,7 @@ cc_defaults { 
        android: {

            shared_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

                "libcutils",

                "libhidlbase",

                "libutils",

system/gd/hal/fuzz/fuzz_hci_hal.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ class FuzzHciHal : public HciHal { 
  void sendHciCommand(HciPacket command) override;

  void sendAclData(HciPacket packet) override {}

  void sendScoData(HciPacket packet) override {}

  void sendIsoData(HciPacket packet) override {}



  void injectArbitrary(FuzzedDataProvider& fdp);
@@ -50,6 +51,7 @@ class FuzzHciHal : public HciHal { 
  void injectAclData(std::vector<uint8_t> data);

  void injectHciEvent(std::vector<uint8_t> data);

  void injectScoData(std::vector<uint8_t> data);

  void injectIsoData(std::vector<uint8_t> data);



  HciHalCallbacks* callbacks_;

  hci::OpCode waiting_opcode_;

system/gd/hal/hci_hal.h

+5 −0
Original line number Diff line number Diff line
@@ -92,6 +92,11 @@ class HciHal : public ::bluetooth::Module { 
  // V4.2, Vol 2, Part 5, Section 5.4.3) to the Bluetooth controller.

  // Packets must be processed in order.

  virtual void sendScoData(HciPacket data) = 0;



  // Send an HCI ISO data packet (as specified in the Bluetooth Specification

  // V5.2, Vol 4, Part E, Section 5.4.5) to the Bluetooth controller.

  // Packets must be processed in order.

  virtual void sendIsoData(HciPacket data) = 0;

};

// LINT.ThenChange(fuzz/fuzz_hci_hal.h)