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

Commit 1566cb84 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: Exit when the HAL dies" am: e375009b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2569391



Change-Id: I107e5607b920d0f96471e6e2ae79b295483e7a7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5faf1211 e375009b

system/gd/hal/hci_hal_android_hidl.cc

+4 −4
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ namespace { 
class HciDeathRecipient : public ::android::hardware::hidl_death_recipient {

 public:

  virtual void serviceDied(uint64_t /*cookie*/, const android::wp<::android::hidl::base::V1_0::IBase>& /*who*/) {

    LOG_ERROR("Bluetooth HAL service died!");

    LOG_ERROR("Bluetooth HAL service died. Calling exit(0);");

    common::StopWatch::DumpStopWatchLog();

    abort();

    exit(0);

  }

};
@@ -417,9 +417,9 @@ 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!");

            LOG_ERROR("Bluetooth HAL service died. Calling exit(0);");

            common::StopWatch::DumpStopWatchLog();

            abort();

            exit(0);

          }));



      auto death_link =