commit 9cec0e331ad9f9156f3a8a5125e7be04612871c2
author Myles Watson <mylesgw@google.com> Thu Mar 16 16:23:23 2017 -0700
committer Andre Eisenbach <eisenbach@google.com> Wed Mar 22 21:30:40 2017 +0000
tree ae4093f97a3c460ec84f11bfe037ad19e57003af
parent 60449e68d1a6497320c07ea8b4bf6039c28e4421

Bluetooth: Protect pointers and callbacks

Test: kill com.android.bluetooth
Bug: 36150800
Change-Id: I9533731c9ce3776c84e6c1d3fdf3e266b328a084

bluetooth/1.0/default/bluetooth_hci.h

diff --git a/bluetooth/1.0/default/bluetooth_hci.h b/bluetooth/1.0/default/bluetooth_hci.h
index 4f92231..6912405 100644
--- a/bluetooth/1.0/default/bluetooth_hci.h
+++ b/bluetooth/1.0/default/bluetooth_hci.h
@@ -44,8 +44,8 @@
 
  private:
   void sendDataToController(const uint8_t type, const hidl_vec<uint8_t>& data);
-  ::android::sp<IBluetoothHciCallbacks> event_cb_;
-  ::android::sp<BluetoothDeathRecipient> deathRecipient;
+  ::android::sp<BluetoothDeathRecipient> death_recipient_;
+  std::function<void(sp<BluetoothDeathRecipient>&)> unlink_cb_;
 };
 
 extern "C" IBluetoothHci* HIDL_FETCH_IBluetoothHci(const char* name);