diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 06:59:39 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 06:59:39 +0000 |
| commit | fab290345ad407611d8e6832773b567a68573664 (patch) | |
| tree | 7a5c72bff7f76a6bd68008cee9d47d580d732a38 /chromeos/dbus/fake_bluetooth_device_client.cc | |
| parent | 438f7e118b7dceb53043698332d5a653a676da82 (diff) | |
| download | chromium_src-fab290345ad407611d8e6832773b567a68573664.zip chromium_src-fab290345ad407611d8e6832773b567a68573664.tar.gz chromium_src-fab290345ad407611d8e6832773b567a68573664.tar.bz2 | |
Fix the crashing issue with simulated Motorolla Keyboard pairing cancellation.
BUG=268649
TBR=stevenjb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22497002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/fake_bluetooth_device_client.cc')
| -rw-r--r-- | chromeos/dbus/fake_bluetooth_device_client.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/dbus/fake_bluetooth_device_client.cc b/chromeos/dbus/fake_bluetooth_device_client.cc index e5d6f7a..4146163 100644 --- a/chromeos/dbus/fake_bluetooth_device_client.cc +++ b/chromeos/dbus/fake_bluetooth_device_client.cc @@ -995,6 +995,12 @@ void FakeBluetoothDeviceClient::SimulateKeypress( DBusThreadManager::Get()->GetBluetoothAgentManagerClient()); FakeBluetoothAgentServiceProvider* agent_service_provider = fake_bluetooth_agent_manager_client->GetAgentServiceProvider(); + + // The agent service provider object could have been destroyed after the + // pairing is canceled. + if (!agent_service_provider) + return; + agent_service_provider->DisplayPasskey(object_path, 123456, entered); if (entered < 7) { |