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

Commit 826890af authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5907574 from c085df2d to rvc-release 

Change-Id: Id5a461900f778d7ef2b4d59178af07e1b449df40
parents d390e276 c085df2d

system/bta/av/bta_av_main.cc

+4 −2
Original line number Diff line number Diff line
@@ -1114,10 +1114,12 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { 
                  "%s: peer %s BTM_SwitchRole(BTM_ROLE_MASTER) error: %d",

                  __func__, p_scb->PeerAddress().ToString().c_str(), status);

      }

      if (status != BTM_MODE_UNSUPPORTED && status != BTM_DEV_BLACKLISTED) {

        is_ok = false;

        p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;

      }

    }

  }



  return is_ok;

}

system/gd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ cc_library { 
}



cc_binary {

    name: "stack_with_facade",

    name: "bluetooth_stack_with_facade",

    defaults: [

        "gd_defaults",

    ],

system/gd/cert/android_devices_config.json

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
                        "-s",

                        "$(serial_number)",

                        "shell",

                        "/system/bin/stack_with_facade",

                        "/system/bin/bluetooth_stack_with_facade",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log",

system/gd/cert/host_only_config.json

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
                    "label": "stack_under_test",

                    "cmd":

                    [

                        "$ANDROID_HOST_OUT/bin/stack_with_facade",

                        "$ANDROID_HOST_OUT/bin/bluetooth_stack_with_facade",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--rootcanal-port=$(rootcanal_port)",

system/gd/hci/acl_manager.cc

+3 −3
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ struct AclManager::impl { 
    auto& acl_connection = acl_connections_.find(handle)->second;

    if (acl_connection.command_complete_handler_ != nullptr) {

      uint16_t packet_type = packet_type_changed.GetPacketType();

      ;

      acl_connection.command_complete_handler_->Post(

          common::BindOnce(&ConnectionManagementCallbacks::OnConnectionPacketTypeChanged,

                           common::Unretained(acl_connection.command_complete_callbacks_), packet_type));
@@ -442,9 +441,10 @@ struct AclManager::impl { 
    uint16_t handle = complete_view.GetConnectionHandle();

    auto& acl_connection = acl_connections_.find(handle)->second;

    if (acl_connection.command_complete_handler_ != nullptr) {

      uint16_t clock_offset = complete_view.GetClockOffset();

      acl_connection.command_complete_handler_->Post(

          common::BindOnce(&ConnectionManagementCallbacks::OnReadClockOffsetComplete,

                           common::Unretained(acl_connection.command_complete_callbacks_)));

                           common::Unretained(acl_connection.command_complete_callbacks_), clock_offset));

    }

  }
@@ -1470,7 +1470,7 @@ bool AclConnection::FlowSpecification(FlowDirection flow_direction, ServiceType 


bool AclConnection::SniffSubrating(uint16_t maximum_latency, uint16_t minimum_remote_timeout,

                                   uint16_t minimum_local_timeout) {

  return manager_->pimpl_->SniffSubrating(handle_, maximum_latency, maximum_latency, minimum_local_timeout);

  return manager_->pimpl_->SniffSubrating(handle_, maximum_latency, minimum_remote_timeout, minimum_local_timeout);

}



bool AclConnection::Flush() {