device/bluetooth/bluetooth_adapter_android.h - Issue 1150833002: bluetooth: android: Initial Low Energy Discovery Sessions.

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.h

Issue 1150833002: bluetooth: android: Initial Low Energy Discovery Sessions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-manifest-

Patch Set: addressed tedchoc's comments Created 5 years, 7 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

« device/bluetooth/android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java ('K') | « device/bluetooth/android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java ('k') | device/bluetooth/bluetooth_adapter_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_adapter_android.h

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

index d458bb5659cc2a42c1de519da1bc02db69dc1531..dec75b162454d6890073c9d87dddae702753dc3d 100644

--- a/device/bluetooth/bluetooth_adapter_android.h

+++ b/device/bluetooth/bluetooth_adapter_android.h

@@ -31,7 +31,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterAndroid final

static bool RegisterJNI(JNIEnv* env);

// True if this app has android permissions necessary for Bluetooth.

- bool HasBluetoothPermission() const;

+ bool HasBluetoothCapability() const;

// BluetoothAdapter:

std::string GetAddress() const override;

@@ -69,6 +69,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterAndroid final

const CreateAdvertisementCallback& callback,

const CreateAdvertisementErrorCallback& error_callback) override;

+ // Handles a scan error event by invalidating all discovery sessions.

+ void OnScanFailed(JNIEnv* env, jobject obj);

protected:

BluetoothAdapterAndroid();

~BluetoothAdapterAndroid() override;