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 62a405a124ad2d91849736aefeef0003b11c97ea..0708a3bafb6a1681ea8924735f36b73b167b4cc6 100644 |
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc |
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc |
@@ -44,7 +44,7 @@ BluetoothRemoteGattDescriptorAndroid::Create( |
BluetoothRemoteGattDescriptorAndroid::~BluetoothRemoteGattDescriptorAndroid() { |
Java_ChromeBluetoothRemoteGattDescriptor_onBluetoothRemoteGattDescriptorAndroidDestruction( |
- AttachCurrentThread(), j_descriptor_.obj()); |
+ AttachCurrentThread(), j_descriptor_); |
} |
// static |
@@ -65,7 +65,7 @@ std::string BluetoothRemoteGattDescriptorAndroid::GetIdentifier() const { |
BluetoothUUID BluetoothRemoteGattDescriptorAndroid::GetUUID() const { |
return device::BluetoothUUID( |
ConvertJavaStringToUTF8(Java_ChromeBluetoothRemoteGattDescriptor_getUUID( |
- AttachCurrentThread(), j_descriptor_.obj()))); |
+ AttachCurrentThread(), j_descriptor_))); |
} |
const std::vector<uint8_t>& BluetoothRemoteGattDescriptorAndroid::GetValue() |
@@ -97,7 +97,7 @@ void BluetoothRemoteGattDescriptorAndroid::ReadRemoteDescriptor( |
} |
if (!Java_ChromeBluetoothRemoteGattDescriptor_readRemoteDescriptor( |
- AttachCurrentThread(), j_descriptor_.obj())) { |
+ AttachCurrentThread(), j_descriptor_)) { |
base::ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
base::Bind(error_callback, |
@@ -124,8 +124,7 @@ void BluetoothRemoteGattDescriptorAndroid::WriteRemoteDescriptor( |
JNIEnv* env = AttachCurrentThread(); |
if (!Java_ChromeBluetoothRemoteGattDescriptor_writeRemoteDescriptor( |
- env, j_descriptor_.obj(), |
- base::android::ToJavaByteArray(env, new_value).obj())) { |
+ env, j_descriptor_, base::android::ToJavaByteArray(env, new_value))) { |
base::ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, |
base::Bind(error_callback, |