| 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_;
|
|
|
|
|