Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1953)

Unified Diff: device/bluetooth/bluetooth_device_android.cc

Issue 2009753002: bluetooth: Make public BluetoothDevice::GetName method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge TOT Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_device_android.cc
diff --git a/device/bluetooth/bluetooth_device_android.cc b/device/bluetooth/bluetooth_device_android.cc
index 8e5b2ec261b06a9fd32393c37fa0a5df47327094..5d101ce892d79f985640a2e2a06741ae4351170d 100644
--- a/device/bluetooth/bluetooth_device_android.cc
+++ b/device/bluetooth/bluetooth_device_android.cc
@@ -103,6 +103,14 @@ uint16_t BluetoothDeviceAndroid::GetAppearance() const {
return 0;
}
+base::Optional<std::string> BluetoothDeviceAndroid::GetName() const {
+ auto name = Java_ChromeBluetoothDevice_getName(AttachCurrentThread(),
+ j_device_.obj());
+ if (name.is_null())
+ return base::Optional<std::string>();
+ return base::Optional<std::string>(ConvertJavaStringToUTF8(name));
+}
+
bool BluetoothDeviceAndroid::IsPaired() const {
return Java_ChromeBluetoothDevice_isPaired(AttachCurrentThread(),
j_device_.obj());
@@ -280,16 +288,6 @@ void BluetoothDeviceAndroid::CreateGattRemoteService(
BluetoothDeviceAndroid::BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter)
: BluetoothDevice(adapter) {}
-std::string BluetoothDeviceAndroid::GetDeviceName() const {
- auto device_name = Java_ChromeBluetoothDevice_getDeviceName(
- AttachCurrentThread(), j_device_.obj());
-
- if (device_name.is_null()) {
- return "";
- }
- return ConvertJavaStringToUTF8(device_name);
-}
-
void BluetoothDeviceAndroid::CreateGattConnectionImpl() {
Java_ChromeBluetoothDevice_createGattConnectionImpl(
AttachCurrentThread(), j_device_.obj(),

Powered by Google App Engine
This is Rietveld 408576698