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

Commit b82f2088 authored by Myles Watson's avatar Myles Watson
Browse files

HAL: Print an error on a timeout for cuttlefish 

500 ms should be sufficient for finding the Bluetooth HAL,
but when it is not, complain loudly and continue, in case
the HAL still starts.

Bug: 233804549
Test: atest
Change-Id: Ic20f0bc4f494f8e72aec1af8205b7be5e0ce9165
parent 7bb4b030

system/gd/hal/hci_hal_android_hidl.cc

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hal/snoop_logger.h"

#include "os/alarm.h"

#include "os/log.h"

#include "os/system_properties.h"



using ::android::hardware::hidl_vec;

using ::android::hardware::Return;
@@ -210,6 +211,15 @@ class HciHalHidl : public HciHal { 
    auto get_service_alarm = new os::Alarm(GetHandler());

    get_service_alarm->Schedule(

        BindOnce([] {

          const std::string kBoardProperty = "ro.product.board";

          const std::string kCuttlefishBoard = "cutf";

          auto board_name = os::GetSystemProperty(kBoardProperty);

          bool emulator = board_name.has_value() && board_name.value() == kCuttlefishBoard;

          if (emulator) {

            LOG_ERROR("board_name: %s", board_name.value().c_str());

            LOG_ERROR("Unable to get a Bluetooth service after 500ms, start the HAL before starting Bluetooth");

            return;

          }

          LOG_ALWAYS_FATAL("Unable to get a Bluetooth service after 500ms, start the HAL before starting Bluetooth");

        }),

        std::chrono::milliseconds(500));