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

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

Issue 2205693003: bluetooth: Replace old advertised uuids (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Fix mac Created 4 years, 4 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 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 #include "device/bluetooth/bluetooth_adapter_android.h" 5 #include "device/bluetooth/bluetooth_adapter_android.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 num_discovery_sessions_ = 0; 174 num_discovery_sessions_ = 0;
175 MarkDiscoverySessionsAsInactive(); 175 MarkDiscoverySessionsAsInactive();
176 } 176 }
177 177
178 void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan( 178 void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan(
179 JNIEnv* env, 179 JNIEnv* env,
180 const JavaParamRef<jobject>& caller, 180 const JavaParamRef<jobject>& caller,
181 const JavaParamRef<jstring>& address, 181 const JavaParamRef<jstring>& address,
182 const JavaParamRef<jobject>& 182 const JavaParamRef<jobject>&
183 bluetooth_device_wrapper, // Java Type: bluetoothDeviceWrapper 183 bluetooth_device_wrapper, // Java Type: bluetoothDeviceWrapper
184 const JavaParamRef<jobject>& 184 const JavaParamRef<jobjectArray>&
185 advertised_uuids) { // Java Type: List<ParcelUuid> 185 advertised_uuids) { // Java Type: List<ParcelUuid>
186 std::string device_address = ConvertJavaStringToUTF8(env, address); 186 std::string device_address = ConvertJavaStringToUTF8(env, address);
187 DevicesMap::const_iterator iter = devices_.find(device_address); 187 DevicesMap::const_iterator iter = devices_.find(device_address);
188 188
189 if (iter == devices_.end()) { 189 if (iter == devices_.end()) {
190 // New device. 190 // New device.
191 BluetoothDeviceAndroid* device_android = 191 BluetoothDeviceAndroid* device_android =
192 BluetoothDeviceAndroid::Create(this, bluetooth_device_wrapper); 192 BluetoothDeviceAndroid::Create(this, bluetooth_device_wrapper);
193 device_android->UpdateAdvertisedUUIDs(advertised_uuids); 193 device_android->UpdateAdvertisedUUIDs(advertised_uuids);
194 device_android->UpdateTimestamp(); 194 device_android->UpdateTimestamp();
195 devices_.add(device_address, 195 devices_.add(device_address,
196 std::unique_ptr<BluetoothDevice>(device_android)); 196 std::unique_ptr<BluetoothDevice>(device_android));
197 FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, 197 FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
198 DeviceAdded(this, device_android)); 198 DeviceAdded(this, device_android));
199 } else { 199 } else {
200 // Existing device. 200 // Existing device.
201 BluetoothDeviceAndroid* device_android = 201 BluetoothDeviceAndroid* device_android =
202 static_cast<BluetoothDeviceAndroid*>(iter->second); 202 static_cast<BluetoothDeviceAndroid*>(iter->second);
203 device_android->UpdateTimestamp(); 203 device_android->UpdateTimestamp();
204 if (device_android->UpdateAdvertisedUUIDs(advertised_uuids)) { 204 device_android->UpdateAdvertisedUUIDs(advertised_uuids);
205 FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, 205
206 DeviceChanged(this, device_android)); 206 FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
scheib 2016/08/05 18:49:31 Only notify if UUIDs are different.
ortuno 2016/08/05 23:00:16 This specific change has little to do with the adv
scheib 2016/08/06 00:21:41 OK, thanks for explanation -- Document on adapter:
ortuno 2016/08/08 22:56:39 Added a comment to explicitly mention that DeviceC
207 } 207 DeviceChanged(this, device_android));
208 } 208 }
209 } 209 }
210 210
211 BluetoothAdapterAndroid::BluetoothAdapterAndroid() : weak_ptr_factory_(this) { 211 BluetoothAdapterAndroid::BluetoothAdapterAndroid() : weak_ptr_factory_(this) {
212 } 212 }
213 213
214 BluetoothAdapterAndroid::~BluetoothAdapterAndroid() { 214 BluetoothAdapterAndroid::~BluetoothAdapterAndroid() {
215 Java_ChromeBluetoothAdapter_onBluetoothAdapterAndroidDestruction( 215 Java_ChromeBluetoothAdapter_onBluetoothAdapterAndroidDestruction(
216 AttachCurrentThread(), j_adapter_.obj()); 216 AttachCurrentThread(), j_adapter_.obj());
217 } 217 }
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 // TODO(scheib): Support filters crbug.com/490401 302 // TODO(scheib): Support filters crbug.com/490401
303 NOTIMPLEMENTED(); 303 NOTIMPLEMENTED();
304 error_callback.Run(UMABluetoothDiscoverySessionOutcome::NOT_IMPLEMENTED); 304 error_callback.Run(UMABluetoothDiscoverySessionOutcome::NOT_IMPLEMENTED);
305 } 305 }
306 306
307 void BluetoothAdapterAndroid::RemovePairingDelegateInternal( 307 void BluetoothAdapterAndroid::RemovePairingDelegateInternal(
308 device::BluetoothDevice::PairingDelegate* pairing_delegate) { 308 device::BluetoothDevice::PairingDelegate* pairing_delegate) {
309 } 309 }
310 310
311 } // namespace device 311 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698