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

Commit 742c4db3 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge "Bluetooth HAL uses "default" service name"

parents ae548da7 b5558e3d

bluetooth/1.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,5 +25,5 @@ using android::hardware::bluetooth::V1_0::IBluetoothHci; 
using android::hardware::defaultPassthroughServiceImplementation;



int main() {

  return defaultPassthroughServiceImplementation<IBluetoothHci>("bluetooth");

  return defaultPassthroughServiceImplementation<IBluetoothHci>();

}

bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp

+2 −4
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ using ::android::hardware::Return; 
using ::android::hardware::Void;

using ::android::sp;



#define Bluetooth_HCI_SERVICE_NAME "bluetooth"



#define HCI_MINIMUM_HCI_VERSION 5  // Bluetooth Core Specification 3.0 + HS

#define HCI_MINIMUM_LMP_VERSION 5  // Bluetooth Core Specification 3.0 + HS

#define NUM_HCI_COMMANDS_BANDWIDTH 1000
@@ -123,8 +121,8 @@ class BluetoothHidlTest : public ::testing::Test { 
 public:

  virtual void SetUp() override {

    // currently test passthrough mode only

    bluetooth = IBluetoothHci::getService(Bluetooth_HCI_SERVICE_NAME);

    ALOGW("%s: getService(%s) is %s", __func__, Bluetooth_HCI_SERVICE_NAME,

    bluetooth = IBluetoothHci::getService();

    ALOGW("%s: getService() for bluetooth is %s", __func__,

          bluetooth->isRemote() ? "remote" : "local");

    ASSERT_NE(bluetooth, nullptr);