| Index: device/bluetooth/bluetooth_device_android.cc
|
| diff --git a/device/bluetooth/bluetooth_device_android.cc b/device/bluetooth/bluetooth_device_android.cc
|
| index 61497323f2ab9b035f7928414ead34850a64202f..8e5b2ec261b06a9fd32393c37fa0a5df47327094 100644
|
| --- a/device/bluetooth/bluetooth_device_android.cc
|
| +++ b/device/bluetooth/bluetooth_device_android.cc
|
| @@ -281,8 +281,13 @@ BluetoothDeviceAndroid::BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter)
|
| : BluetoothDevice(adapter) {}
|
|
|
| std::string BluetoothDeviceAndroid::GetDeviceName() const {
|
| - return ConvertJavaStringToUTF8(Java_ChromeBluetoothDevice_getDeviceName(
|
| - AttachCurrentThread(), j_device_.obj()));
|
| + auto device_name = Java_ChromeBluetoothDevice_getDeviceName(
|
| + AttachCurrentThread(), j_device_.obj());
|
| +
|
| + if (device_name.is_null()) {
|
| + return "";
|
| + }
|
| + return ConvertJavaStringToUTF8(device_name);
|
| }
|
|
|
| void BluetoothDeviceAndroid::CreateGattConnectionImpl() {
|
|
|