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

Commit 9c2ce08c authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "bluetooth_test_gd: Remove leaked thread and DB" 

am: 158082f1

Change-Id: I1291469fcfae5533ba0ebb5b8ce4a1110e75cd56
parents f33a7486 158082f1

system/gd/hci/device_database.h

+1 −4
Original line number Diff line number Diff line
@@ -37,10 +37,7 @@ namespace bluetooth::hci { 
 */

class DeviceDatabase {

 public:

  DeviceDatabase()

      : classic_device_map_(*new std::map<std::string, std::shared_ptr<ClassicDevice>>),

        le_device_map_(*new std::map<std::string, std::shared_ptr<LeDevice>>),

        dual_device_map_(*new std::map<std::string, std::shared_ptr<DualDevice>>) {

  DeviceDatabase() : classic_device_map_(), le_device_map_(), dual_device_map_() {

    if (!ReadFromDisk()) {

      LOG_WARN("First boot or missing data!");

    }

system/gd/security/test/fake_l2cap_test.cc

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ TEST_F(FakeL2capTest, test_bidi_queue_example) { 
  EXPECT_TRUE(other_end_packet != nullptr);



  bidi_queue.GetDownEnd()->UnregisterDequeue();

  handler_->Clear();

  delete handler_;

  delete thread_;

}



}  // namespace security