| Index: device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc b/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc
|
| index 889af03dba863611768c3cd584beee973ca3332a..9e238c773b133de8a118f0fd0c2657338292e5dc 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc
|
| @@ -65,22 +65,18 @@ BluetoothUUID BluetoothRemoteGattDescriptorAndroid::GetUUID() const {
|
| AttachCurrentThread(), j_descriptor_.obj())));
|
| }
|
|
|
| -bool BluetoothRemoteGattDescriptorAndroid::IsLocal() const {
|
| - return false;
|
| -}
|
| -
|
| const std::vector<uint8_t>& BluetoothRemoteGattDescriptorAndroid::GetValue()
|
| const {
|
| return value_;
|
| }
|
|
|
| -BluetoothGattCharacteristic*
|
| +BluetoothRemoteGattCharacteristic*
|
| BluetoothRemoteGattDescriptorAndroid::GetCharacteristic() const {
|
| NOTIMPLEMENTED();
|
| return nullptr;
|
| }
|
|
|
| -BluetoothGattCharacteristic::Permissions
|
| +BluetoothRemoteGattCharacteristic::Permissions
|
| BluetoothRemoteGattDescriptorAndroid::GetPermissions() const {
|
| NOTIMPLEMENTED();
|
| return 0;
|
| @@ -91,8 +87,9 @@ void BluetoothRemoteGattDescriptorAndroid::ReadRemoteDescriptor(
|
| const ErrorCallback& error_callback) {
|
| if (read_pending_ || write_pending_) {
|
| base::MessageLoop::current()->PostTask(
|
| - FROM_HERE, base::Bind(error_callback,
|
| - BluetoothGattService::GATT_ERROR_IN_PROGRESS));
|
| + FROM_HERE,
|
| + base::Bind(error_callback,
|
| + BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
|
| return;
|
| }
|
|
|
| @@ -116,8 +113,9 @@ void BluetoothRemoteGattDescriptorAndroid::WriteRemoteDescriptor(
|
| const ErrorCallback& error_callback) {
|
| if (read_pending_ || write_pending_) {
|
| base::MessageLoop::current()->PostTask(
|
| - FROM_HERE, base::Bind(error_callback,
|
| - BluetoothGattService::GATT_ERROR_IN_PROGRESS));
|
| + FROM_HERE,
|
| + base::Bind(error_callback,
|
| + BluetoothRemoteGattService::GATT_ERROR_IN_PROGRESS));
|
| return;
|
| }
|
|
|
|
|