diff options
| author | scheib <scheib@chromium.org> | 2015-09-16 15:09:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 22:10:57 +0000 |
| commit | eea0c48ed229131a6ce9fb61a883ae9272febe84 (patch) | |
| tree | 1a3635343895b85d1267af86aa6add7561a7f729 /device/bluetooth/bluetooth_adapter_android.cc | |
| parent | b55571cafb86bd1c970611b91bd65aeabf05f190 (diff) | |
| download | chromium_src-eea0c48ed229131a6ce9fb61a883ae9272febe84.zip chromium_src-eea0c48ed229131a6ce9fb61a883ae9272febe84.tar.gz chromium_src-eea0c48ed229131a6ce9fb61a883ae9272febe84.tar.bz2 | |
bluetooth: Add adapter to BluetoothDevice
The base class BluetoothDevice::CreateGattConnection implementation
requires access to the BluetoothAdapter. This patch updates all
subclasses to provide it.
Part of a 4 patch series:
https://crrev.com/1287753002 Remove Disconnect callback
https://crrev.com/1284073002 Add adapter_ to BluetoothDevice <<<
https://crrev.com/1292263002 BluetoothDevice::CreateGattConnection Impl
https://crrev.com/1256313002 Android Impl & tests.
BUG=512643
Review URL: https://codereview.chromium.org/1284073002
Cr-Commit-Position: refs/heads/master@{#349248}
Diffstat (limited to 'device/bluetooth/bluetooth_adapter_android.cc')
| -rw-r--r-- | device/bluetooth/bluetooth_adapter_android.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/device/bluetooth/bluetooth_adapter_android.cc b/device/bluetooth/bluetooth_adapter_android.cc index be47e91..9f39e4c 100644 --- a/device/bluetooth/bluetooth_adapter_android.cc +++ b/device/bluetooth/bluetooth_adapter_android.cc @@ -141,7 +141,7 @@ void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan( jobject advertised_uuids) { // Java Type: List<ParcelUuid> BluetoothDevice*& device = devices_[ConvertJavaStringToUTF8(env, address)]; if (!device) { - device = BluetoothDeviceAndroid::Create(bluetooth_device_wrapper); + device = BluetoothDeviceAndroid::Create(this, bluetooth_device_wrapper); static_cast<BluetoothDeviceAndroid*>(device) ->UpdateAdvertisedUUIDs(advertised_uuids); FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, |