summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMyles Watson2017-08-24 11:13:02 -0500
committerMyles Watson2017-08-24 12:48:18 -0500
commit9833109a3e8cb5d4935e7288af435fbef1ca6c75 (patch)
tree8b52c6d290a96335b9731044065b412ba24ff2cd
parent36cb0a2d998ecccd32f76a6d788da5282bfd8bd9 (diff)
downloadplatform-hardware-interfaces-9833109a3e8cb5d4935e7288af435fbef1ca6c75.tar.gz
platform-hardware-interfaces-9833109a3e8cb5d4935e7288af435fbef1ca6c75.tar.xz
platform-hardware-interfaces-9833109a3e8cb5d4935e7288af435fbef1ca6c75.zip
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
-rw-r--r--bluetooth/1.0/default/vendor_interface.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index 15b6c745..6ce2f11f 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -162,8 +162,10 @@ bool VendorInterface::Initialize(
162 InitializeCompleteCallback initialize_complete_cb, 162 InitializeCompleteCallback initialize_complete_cb,
163 PacketReadCallback event_cb, PacketReadCallback acl_cb, 163 PacketReadCallback event_cb, PacketReadCallback acl_cb,
164 PacketReadCallback sco_cb) { 164 PacketReadCallback sco_cb) {
165 LOG_ALWAYS_FATAL_IF(g_vendor_interface, "%s: No previous Shutdown()?", 165 if (g_vendor_interface) {
166 __func__); 166 ALOGE("%s: No previous Shutdown()?", __func__);
167 return false;
168 }
167 g_vendor_interface = new VendorInterface(); 169 g_vendor_interface = new VendorInterface();
168 return g_vendor_interface->Open(initialize_complete_cb, event_cb, acl_cb, 170 return g_vendor_interface->Open(initialize_complete_cb, event_cb, acl_cb,
169 sco_cb); 171 sco_cb);