tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Bluetooth: Do not die quietly on binder death" am: e5796ef7a6

Browse source 
am: 810bb51999

Change-Id: I0aa8e83a1f4ca3c51e66e0a32c23e4501a05530a
This commit is contained in:
Andre Eisenbach 2017-03-19 23:51:44 +00:00 committed by android-build-merger
commit d50f39d08e
2 changed files with 37 additions and 15 deletions
Show stats 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: