Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 23:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Bluetooth: Add CHECK and move ASSERT" am: b835ea3f11

Browse Source 
am: 028ce01354

Change-Id: Ia432ecc1676f926a157eb6b978990c19814f2aa4
This commit is contained in:
Myles Watson
2017-02-14 02:18:43 +00:00
committed by android-build-merger
parent 0c5f363811 028ce01354
commit 4bbcb8f41e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bluetooth/1.0/default/vendor_interface.cc
View File

@@ -414,6 +414,7 @@ void VendorInterface::OnDataReady(int fd) {
hci_packet_.data() + preamble_size_for_type[hci_packet_type_] +
hci_packet_bytes_read_,
hci_packet_bytes_remaining_));
CHECK(bytes_read > 0);
hci_packet_bytes_remaining_ -= bytes_read;
hci_packet_bytes_read_ += bytes_read;
if (hci_packet_bytes_remaining_ == 0) {

2
bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp
View File

@@ -122,9 +122,9 @@ class BluetoothHidlTest : public ::testing::Test {
virtual void SetUp() override {
// currently test passthrough mode only
bluetooth = IBluetoothHci::getService();
ASSERT_NE(bluetooth, nullptr);
ALOGW("%s: getService() for bluetooth is %s", __func__,
bluetooth->isRemote() ? "remote" : "local");
ASSERT_NE(bluetooth, nullptr);
bluetooth_cb = new BluetoothHciCallbacks(*this);
ASSERT_NE(bluetooth_cb, nullptr);