Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Do not die quietly on binder death

Browse Source 
Log if the Bluetooth service has died.
Also check the return status for Bluetooth service binder callbacks to
avoid DEAD_OBJECT exception when com.android.bluetooth crashes.

Bug: 36026072
Test: unit tests; Bluetooth off/on/off; kill -6 com.android.bluetooth
Change-Id: Ia28e6777ee7b78f06db8d5214324e696441d00f7
This commit is contained in:
Andre Eisenbach
2017-03-16 22:19:19 -07:00
committed by Myles Watson
parent a8dce86cd8
commit 9f8931cf47
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
bluetooth/1.0/default/bluetooth_hci.cc
View File

@@ -30,6 +30,19 @@ static const uint8_t HCI_DATA_TYPE_COMMAND = 1;
static const uint8_t HCI_DATA_TYPE_ACL = 2;
static const uint8_t HCI_DATA_TYPE_SCO = 3;
class BluetoothDeathRecipient : public hidl_death_recipient {
public:
BluetoothDeathRecipient(const sp<IBluetoothHci> hci) : mHci(hci) {}
virtual void serviceDied(
uint64_t /*cookie*/,
const wp<::android::hidl::base::V1_0::IBase>& /*who*/) {
ALOGE("BluetoothDeathRecipient::serviceDied - Bluetooth service died");
mHci->close();
}
sp<IBluetoothHci> mHci;
};
BluetoothHci::BluetoothHci()
: deathRecipient(new BluetoothDeathRecipient(this)) {}
@@ -41,19 +54,37 @@ Return<void> BluetoothHci::initialize(
bool rc = VendorInterface::Initialize(
[this](bool status) {
event_cb_->initializationComplete(
auto hidl_status = event_cb_->initializationComplete(
status ? Status::SUCCESS : Status::INITIALIZATION_ERROR);
if (!hidl_status.isOk()) {
ALOGE("VendorInterface -> Unable to call initializationComplete()");
}
},
[this](const hidl_vec<uint8_t>& packet) {
event_cb_->hciEventReceived(packet);
auto hidl_status = event_cb_->hciEventReceived(packet);
if (!hidl_status.isOk()) {
ALOGE("VendorInterface -> Unable to call hciEventReceived()");
}
},
[this](const hidl_vec<uint8_t>& packet) {
event_cb_->aclDataReceived(packet);
auto hidl_status = event_cb_->aclDataReceived(packet);
if (!hidl_status.isOk()) {
ALOGE("VendorInterface -> Unable to call aclDataReceived()");
}
},
[this](const hidl_vec<uint8_t>& packet) {
event_cb_->scoDataReceived(packet);
auto hidl_status = event_cb_->scoDataReceived(packet);
if (!hidl_status.isOk()) {
ALOGE("VendorInterface -> Unable to call scoDataReceived()");
}
});
if (!rc) event_cb_->initializationComplete(Status::INITIALIZATION_ERROR);
if (!rc) {
auto hidl_status =
event_cb_->initializationComplete(Status::INITIALIZATION_ERROR);
if (!hidl_status.isOk()) {
ALOGE("VendorInterface -> Unable to call initializationComplete(ERR)");
}
}
return Void();
}

11
bluetooth/1.0/default/bluetooth_hci.h
View File

@@ -30,16 +30,7 @@ namespace implementation {
using ::android::hardware::Return;
using ::android::hardware::hidl_vec;
struct BluetoothDeathRecipient : hidl_death_recipient {
BluetoothDeathRecipient(const sp<IBluetoothHci> hci) : mHci(hci) {}
virtual void serviceDied(
uint64_t /*cookie*/,
const wp<::android::hidl::base::V1_0::IBase>& /*who*/) {
mHci->close();
}
sp<IBluetoothHci> mHci;
};
class BluetoothDeathRecipient;
class BluetoothHci : public IBluetoothHci {
public: