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

Commit 30a95476 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5968874 from 973d8561 to rvc-release 

Change-Id: I1843fd674927265540196926f93b65ac66737cf7
parents bc81373c 973d8561

system/btif/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ cc_library_static { 
        "src/btif_util.cc",

        "src/stack_manager.cc",

    ],

    header_libs: [

        "libmedia_headers",

    ],

    shared_libs: [

        "libaudioclient",

        "libcutils",

system/gd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ cc_fuzz { 
  defaults: ["gd_defaults"],

  srcs: [

    "fuzz_test.cc",

    ":BluetoothHciFuzzTestSources",

    ":BluetoothL2capFuzzTestSources",

  ],

  static_libs: [

system/gd/fuzz_test.cc

+2 −0
Original line number Diff line number Diff line
@@ -19,9 +19,11 @@ 


extern void RunL2capClassicDynamicChannelAllocatorFuzzTest(const uint8_t* data, size_t size);

extern void RunL2capPacketFuzzTest(const uint8_t* data, size_t size);

extern void RunHciPacketFuzzTest(const uint8_t* data, size_t size);



extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

  RunL2capClassicDynamicChannelAllocatorFuzzTest(data, size);

  RunL2capPacketFuzzTest(data, size);

  RunHciPacketFuzzTest(data, size);

  return 0;

}
 
 No newline at end of file

system/gd/hci/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -43,3 +43,10 @@ filegroup { 
        "cert/cert.cc",

    ],

}



filegroup {

    name: "BluetoothHciFuzzTestSources",

    srcs: [

        "hci_packets_fuzz_test.cc",

    ],

}

system/gd/hci/acl_manager.cc

+4 −2
Original line number Diff line number Diff line
@@ -291,8 +291,9 @@ struct AclManager::impl { 
    if (acl_connections_.size() == 1 && packet_to_send_ == nullptr) {

      start_round_robin();

    }

    auto role = connection_complete.GetRole();

    std::unique_ptr<AclConnection> connection_proxy(

        new AclConnection(&acl_manager_, handle, address, peer_address_type));

        new AclConnection(&acl_manager_, handle, address, peer_address_type, role));

    le_client_handler_->Post(common::BindOnce(&LeConnectionCallbacks::OnLeConnectSuccess,

                                              common::Unretained(le_client_callbacks_), address_with_type,

                                              std::move(connection_proxy)));
@@ -323,8 +324,9 @@ struct AclManager::impl { 
    if (acl_connections_.size() == 1 && packet_to_send_ == nullptr) {

      start_round_robin();

    }

    auto role = connection_complete.GetRole();

    std::unique_ptr<AclConnection> connection_proxy(

        new AclConnection(&acl_manager_, handle, address, peer_address_type));

        new AclConnection(&acl_manager_, handle, address, peer_address_type, role));

    le_client_handler_->Post(common::BindOnce(&LeConnectionCallbacks::OnLeConnectSuccess,

                                              common::Unretained(le_client_callbacks_), reporting_address_with_type,

                                              std::move(connection_proxy)));