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

Commit 9833109a authored by Myles Watson's avatar Myles Watson
Browse files

Bluetooth: Return false when not shut down 

Do not crash in the vendor layer.  The stack will crash
when it fails to initialize.

Bug: 64535243
Test: Bluetooth starts/stops
Change-Id: I69fdd2879c80fa2f006c50f0a42a85e9289b14fe
parent 36cb0a2d

bluetooth/1.0/default/vendor_interface.cc

+4 −2
Original line number Diff line number Diff line
@@ -162,8 +162,10 @@ bool VendorInterface::Initialize( 
    InitializeCompleteCallback initialize_complete_cb,

    PacketReadCallback event_cb, PacketReadCallback acl_cb,

    PacketReadCallback sco_cb) {

  LOG_ALWAYS_FATAL_IF(g_vendor_interface, "%s: No previous Shutdown()?",

                      __func__);

  if (g_vendor_interface) {

    ALOGE("%s: No previous Shutdown()?", __func__);

    return false;

  }

  g_vendor_interface = new VendorInterface();

  return g_vendor_interface->Open(initialize_complete_cb, event_cb, acl_cb,

                                  sco_cb);