device/bluetooth/bluetooth_remote_gatt_characteristic_android.h - Issue 1779083002: bluetooth: Test & make StartNotifySession reentrant.

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

Issue 1779083002: bluetooth: Test & make StartNotifySession reentrant. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bta-notify-followup-descriptors-

Patch Set: Updated patchset dependency Created 4 years, 9 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/bluetooth_gatt_characteristic_unittest.cc ('K') | « device/bluetooth/bluetooth_gatt_descriptor_unittest.cc ('k') | device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc » ('j') | device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

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

index 606b7d4ffa4f0da711801abe434d7e92e0cc9826..fa77764e0e0bf3485bfa15cde9f414b827cbcf46 100644

--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

@@ -7,8 +7,6 @@

#include <stdint.h>

-#include <queue>

#include "base/android/jni_android.h"

#include "base/containers/scoped_ptr_hash_map.h"

#include "base/macros.h"

@@ -134,7 +132,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicAndroid

// StartNotifySession callbacks and pending state.

typedef std::pair<NotifySessionCallback, ErrorCallback>

PendingStartNotifyCall;

- std::queue<PendingStartNotifyCall> pending_start_notify_calls_;

+ std::vector<PendingStartNotifyCall> pending_start_notify_calls_;

// ReadRemoteCharacteristic callbacks and pending state.

bool read_pending_ = false;