device/bluetooth/bluetooth_adapter_android.cc - Issue 1284073002: bluetooth: Add adapter to BluetoothDevice

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_adapter_android.cc

Issue 1284073002: bluetooth: Add adapter to BluetoothDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-drop-callback-

Patch Set: Merge TOT Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc ('k') | device/bluetooth/bluetooth_adapter_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_adapter_android.cc

diff --git a/device/bluetooth/bluetooth_adapter_android.cc b/device/bluetooth/bluetooth_adapter_android.cc

index be47e919933534b39cca078e1b977c15710c35e4..9f39e4c4acd9f425bf4f0163436c23c8ccb6d23e 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_,