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

Commit 0f42e623 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "main: Update error handling" am: 6eeebfaa am: ef2b0fef 

am: f900035a

Change-Id: Idc0233581f04c87a7387a28a71706b0356f84f35
parents 5529de18 f900035a

system/main/bte_logmsg.cc

+2 −1
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...) { 
      break;

    default:

      /* we should never get this */

      LOG_ERROR(bt_layer_tags[trace_layer], "%s", buffer);

      LOG_ERROR(bt_layer_tags[trace_layer], "!BAD TRACE TYPE! %s", buffer);

      CHECK(TRACE_GET_TYPE(trace_set_mask) == TRACE_TYPE_ERROR);

      break;

  }

}

system/main/bte_main.cc

+3 −1
Original line number Diff line number Diff line
@@ -100,8 +100,10 @@ void bte_main_boot_entry(void) { 
  module_init(get_module(INTEROP_MODULE));



  hci = hci_layer_get_interface();

  if (!hci)

  if (!hci) {

    LOG_ERROR(LOG_TAG, "%s could not get hci layer interface.", __func__);

    return;

  }



  btu_hci_msg_queue = fixed_queue_new(SIZE_MAX);

  if (btu_hci_msg_queue == NULL) {