| Index: device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| index 0e860b5ed85a2eed0110ad67c37918864b1f204a..b15b0f5fcadaf62d1ec2116ba74141c329bc8f60 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| @@ -258,12 +258,11 @@ void BluetoothRemoteGattCharacteristicMac::DidUpdateValue(NSError* error) {
|
| callbacks.swap(read_characteristic_value_callbacks_);
|
| characteristic_value_read_or_write_in_progress_ = false;
|
| if (error) {
|
| - VLOG(1) << *this
|
| - << ": Bluetooth error while reading for characteristic, domain: "
|
| - << base::SysNSStringToUTF8(error.domain)
|
| - << ", error code: " << error.code;
|
| BluetoothGattService::GattErrorCode error_code =
|
| BluetoothDeviceMac::GetGattErrorCodeFromNSError(error);
|
| + VLOG(1) << *this
|
| + << ": Bluetooth error while reading for characteristic, domain: "
|
| + << error << ", error code: " << error_code;
|
| callbacks.second.Run(error_code);
|
| return;
|
| }
|
| @@ -304,12 +303,11 @@ void BluetoothRemoteGattCharacteristicMac::DidWriteValue(NSError* error) {
|
| callbacks.swap(write_characteristic_value_callbacks_);
|
| characteristic_value_read_or_write_in_progress_ = false;
|
| if (error) {
|
| - VLOG(1) << *this
|
| - << ": Bluetooth error while writing for characteristic, domain: "
|
| - << base::SysNSStringToUTF8(error.domain)
|
| - << ", error code: " << error.code;
|
| BluetoothGattService::GattErrorCode error_code =
|
| BluetoothDeviceMac::GetGattErrorCodeFromNSError(error);
|
| + VLOG(1) << *this
|
| + << ": Bluetooth error while writing for characteristic, error: "
|
| + << error << ", error code: " << error_code;
|
| callbacks.second.Run(error_code);
|
| return;
|
| }
|
| @@ -331,14 +329,12 @@ void BluetoothRemoteGattCharacteristicMac::DidUpdateNotificationState(
|
| return;
|
| }
|
| if (error) {
|
| - VLOG(1) << *this
|
| - << ": Bluetooth error while modifying notification state for "
|
| - "characteristic, domain: "
|
| - << base::SysNSStringToUTF8(error.domain)
|
| - << ", error code: " << error.code << ", localized description: "
|
| - << base::SysNSStringToUTF8(error.localizedDescription);
|
| BluetoothGattService::GattErrorCode error_code =
|
| BluetoothDeviceMac::GetGattErrorCodeFromNSError(error);
|
| + VLOG(1) << *this
|
| + << ": Bluetooth error while modifying notification state for "
|
| + "characteristic, error: "
|
| + << error << ", error code: " << error_code;
|
| reentrant_safe_callbacks.second.Run(error_code);
|
| return;
|
| }
|
|
|