commit dcc6f25d059b23da52522cc6af6bf06c9cbc047b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 24 23:31:54 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 24 23:31:54 2017 +0000
tree 8f61e132de682664afc0515fcd4f045201bcd800
parent 9833109a3e8cb5d4935e7288af435fbef1ca6c75
parent 521621d51591d3406038a6eb80e21902801cc5ce

Merge "Bluetooth: Check H4 HCI packet types"

bluetooth/1.0/default/vendor_interface.cc

diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index 15b6c74..6ce2f11 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -162,8 +162,10 @@
     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);