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

Side by Side Diff: device/bluetooth/bluetooth_adapter_android.h

Issue 2377513004: bluetooth:android: Return the advertised name if advertising (Closed)
Patch Set: Format' Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_ANDROID_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_ANDROID_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_ANDROID_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_ANDROID_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 // Creates or updates device with advertised UUID information when a device is 97 // Creates or updates device with advertised UUID information when a device is
98 // discovered during a scan. 98 // discovered during a scan.
99 void CreateOrUpdateDeviceOnScan( 99 void CreateOrUpdateDeviceOnScan(
100 JNIEnv* env, 100 JNIEnv* env,
101 const base::android::JavaParamRef<jobject>& caller, 101 const base::android::JavaParamRef<jobject>& caller,
102 const base::android::JavaParamRef<jstring>& address, 102 const base::android::JavaParamRef<jstring>& address,
103 const base::android::JavaParamRef<jobject>& 103 const base::android::JavaParamRef<jobject>&
104 bluetooth_device_wrapper, // Java Type: bluetoothDeviceWrapper 104 bluetooth_device_wrapper, // Java Type: bluetoothDeviceWrapper
105 int32_t rssi, 105 int32_t rssi,
106 const base::android::JavaParamRef<jstring>& advertised_name,
106 const base::android::JavaParamRef<jobjectArray>& 107 const base::android::JavaParamRef<jobjectArray>&
107 advertised_uuids, // Java Type: String[] 108 advertised_uuids, // Java Type: String[]
108 int32_t tx_power); 109 int32_t tx_power);
109 110
110 protected: 111 protected:
111 BluetoothAdapterAndroid(); 112 BluetoothAdapterAndroid();
112 ~BluetoothAdapterAndroid() override; 113 ~BluetoothAdapterAndroid() override;
113 114
114 // BluetoothAdapter: 115 // BluetoothAdapter:
115 void AddDiscoverySession( 116 void AddDiscoverySession(
(...skipping 24 matching lines...) Expand all
140 // Note: This should remain the last member so it'll be destroyed and 141 // Note: This should remain the last member so it'll be destroyed and
141 // invalidate its weak pointers before any other members are destroyed. 142 // invalidate its weak pointers before any other members are destroyed.
142 base::WeakPtrFactory<BluetoothAdapterAndroid> weak_ptr_factory_; 143 base::WeakPtrFactory<BluetoothAdapterAndroid> weak_ptr_factory_;
143 144
144 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterAndroid); 145 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterAndroid);
145 }; 146 };
146 147
147 } // namespace device 148 } // namespace device
148 149
149 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_ANDROID_H_ 150 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698