summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorachuith <achuith@chromium.org>2015-06-24 12:54:50 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-24 19:55:28 +0000
commit1be4f21fc7e5ec12edaefb141ea873f6130709cd (patch)
treeb221ed2516f7c714fe419550b7f57ccefb3deafc
parent944999197c4dd458135f8cbe1552e66e3b7781a6 (diff)
downloadchromium_src-1be4f21fc7e5ec12edaefb141ea873f6130709cd.zip
chromium_src-1be4f21fc7e5ec12edaefb141ea873f6130709cd.tar.gz
chromium_src-1be4f21fc7e5ec12edaefb141ea873f6130709cd.tar.bz2
Fix bluetooth crash after hotrod enrollment.
BUG=503246 Review URL: https://codereview.chromium.org/1200083002 Cr-Commit-Position: refs/heads/master@{#335980}
-rw-r--r--components/pairing/bluetooth_host_pairing_controller.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/components/pairing/bluetooth_host_pairing_controller.cc b/components/pairing/bluetooth_host_pairing_controller.cc
index c8246b1..c157370 100644
--- a/components/pairing/bluetooth_host_pairing_controller.cc
+++ b/components/pairing/bluetooth_host_pairing_controller.cc
@@ -64,6 +64,7 @@ BluetoothHostPairingController::BluetoothHostPairingController()
}
BluetoothHostPairingController::~BluetoothHostPairingController() {
+ Reset();
if (adapter_.get()) {
if (adapter_->IsDiscoverable()) {
adapter_->SetDiscoverable(false, base::Closure(), base::Closure());