Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2403)

Unified Diff: device/bluetooth/bluetooth_remote_gatt_characteristic_android.h

Issue 2826383002: bluetooth: Make in progress errors consistent across android
Patch Set: Fix windows Created 3 years, 8 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
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 06967e96b0cbe53de89897d4b5d4b5cf0bdce11b..d647c21ec62496eb5e5e8d4a226377f9036e8be6 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
@@ -64,11 +64,13 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicAndroid
std::vector<BluetoothRemoteGattDescriptor*> GetDescriptors() const override;
BluetoothRemoteGattDescriptor* GetDescriptor(
const std::string& identifier) const override;
- void ReadRemoteCharacteristic(const ValueCallback& callback,
- const ErrorCallback& error_callback) override;
- void WriteRemoteCharacteristic(const std::vector<uint8_t>& value,
- const base::Closure& callback,
- const ErrorCallback& error_callback) override;
+ void ReadRemoteCharacteristicImpl(
+ const ValueCallback& callback,
+ const ErrorCallback& error_callback) override;
+ void WriteRemoteCharacteristicImpl(
+ const std::vector<uint8_t>& value,
+ const base::Closure& callback,
+ const ErrorCallback& error_callback) override;
// Called when value changed event occurs.
void OnChanged(JNIEnv* env,
@@ -130,12 +132,10 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicAndroid
std::string instance_id_;
// ReadRemoteCharacteristic callbacks and pending state.
- bool read_pending_ = false;
ValueCallback read_callback_;
ErrorCallback read_error_callback_;
// WriteRemoteCharacteristic callbacks and pending state.
- bool write_pending_ = false;
base::Closure write_callback_;
ErrorCallback write_error_callback_;

Powered by Google App Engine
This is Rietveld 408576698