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

Commit b9052671 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Bluetooth: Sleep before crashing when the HAL dies" into main

parents 9ecf12a3 dfb5a2c8
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -417,9 +417,11 @@ class HciHalHidl : public HciHal {
      LOG_INFO("Using the AIDL interface");
      aidl_death_recipient_ =
          ::ndk::ScopedAIBinder_DeathRecipient(AIBinder_DeathRecipient_new([](void* cookie) {
            LOG_ERROR("Bluetooth HAL service died. Calling exit(0);");
            LOG_ERROR("The Bluetooth HAL service died. Dumping logs and crashing in 1 second.");
            common::StopWatch::DumpStopWatchLog();
            exit(0);
            // At shutdown, sometimes the HAL service gets killed before Bluetooth.
            std::this_thread::sleep_for(std::chrono::seconds(1));
            LOG_ALWAYS_FATAL("The Bluetooth HAL died.");
          }));

      auto death_link =