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

Commit 4bbcb8f4 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

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

am: 028ce013

Change-Id: Ia432ecc1676f926a157eb6b978990c19814f2aa4
parents 0c5f3638 028ce013

bluetooth/1.0/default/vendor_interface.cc

+1 −0
Original line number Diff line number Diff line
@@ -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) {

bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);