tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Bluetooth HAL uses "default" service name" am: 742c4db343

Browse source 
am: df335ff2d1

Change-Id: Ie4463c29ccfac02d0535af75cdde0dc63c4ce54f
This commit is contained in:
Andre Eisenbach 2017-01-18 21:50:53 +00:00 committed by android-build-merger
commit d7eeed3d8d
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bluetooth/1.0/default/service.cpp
View file

@ -25,5 +25,5 @@ using android::hardware::bluetooth::V1_0::IBluetoothHci;
using android::hardware::defaultPassthroughServiceImplementation;
int main() {
return defaultPassthroughServiceImplementation<IBluetoothHci>("bluetooth");
return defaultPassthroughServiceImplementation<IBluetoothHci>();
}

6
bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp
View file

@ -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);