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

Commit b1f40bc1 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

eatt: Fix crash on double disconnect am: 16c38b06 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15028038

Change-Id: Ie578233e767b20e665250cfc24b75eb4a769c43c
parents edfe7285 16c38b06

system/stack/eatt/eatt_impl.h

+10 −1
Original line number Diff line number Diff line
@@ -582,7 +582,16 @@ struct eatt_impl { 
    LOG(INFO) << __func__ << " " << bd_addr;



    eatt_device* eatt_dev = find_device_by_address(bd_addr);

    if (!eatt_dev) return;

    if (!eatt_dev) {

      LOG(WARNING) << __func__ << " no eatt device found";

      return;

    }



    if (!eatt_dev->eatt_tcb_) {

      LOG_ASSERT(eatt_dev->eatt_channels.size() == 0);

      LOG(WARNING) << __func__ << " no eatt channels found";

      return;

    }



    auto iter = eatt_dev->eatt_channels.begin();

    while (iter != eatt_dev->eatt_channels.end()) {

system/stack/test/eatt/eatt_test.cc

+8 −0
Original line number Diff line number Diff line
@@ -370,4 +370,12 @@ TEST_F(EattTest, ReconfigPeerFailed) { 


  DisconnectEattDevice();

}



TEST_F(EattTest, DoubleDisconnect) {

  ConnectDeviceEattSupported(1);

  DisconnectEattDevice();



  /* Force second disconnect */

  eatt_instance_->Disconnect(test_address);

}

}  // namespace