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

Side by Side Diff: device/bluetooth/bluez/bluetooth_adapter_bluez.cc

Issue 2421713002: arc: bluetooth: Expose missing advertise data. (Closed)
Patch Set: fix comment Created 4 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/bluez/bluetooth_adapter_bluez.h" 5 #include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstdint> 8 #include <cstdint>
9 #include <limits> 9 #include <limits>
10 #include <memory> 10 #include <memory>
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 std::unique_ptr<BluetoothDevice>(device_bluez)); 586 std::unique_ptr<BluetoothDevice>(device_bluez));
587 NotifyDeviceAddressChanged(device_bluez, old_address); 587 NotifyDeviceAddressChanged(device_bluez, old_address);
588 break; 588 break;
589 } 589 }
590 } 590 }
591 } 591 }
592 592
593 if (property_name == properties->service_data.name()) 593 if (property_name == properties->service_data.name())
594 device_bluez->UpdateServiceData(); 594 device_bluez->UpdateServiceData();
595 595
596 if (property_name == properties->manufacturer_data.name())
597 device_bluez->UpdateManufacturerData();
598
596 if (property_name == properties->bluetooth_class.name() || 599 if (property_name == properties->bluetooth_class.name() ||
597 property_name == properties->appearance.name() || 600 property_name == properties->appearance.name() ||
598 property_name == properties->address.name() || 601 property_name == properties->address.name() ||
599 property_name == properties->alias.name() || 602 property_name == properties->alias.name() ||
600 property_name == properties->paired.name() || 603 property_name == properties->paired.name() ||
601 property_name == properties->trusted.name() || 604 property_name == properties->trusted.name() ||
602 property_name == properties->connected.name() || 605 property_name == properties->connected.name() ||
603 property_name == properties->uuids.name() || 606 property_name == properties->uuids.name() ||
604 property_name == properties->rssi.name() || 607 property_name == properties->rssi.name() ||
605 property_name == properties->tx_power.name() || 608 property_name == properties->tx_power.name() ||
606 property_name == properties->service_data.name()) { 609 property_name == properties->service_data.name() ||
610 property_name == properties->manufacturer_data.name() ||
611 property_name == properties->advertising_data_flags.name()) {
ortuno 2016/10/18 01:41:18 Should flags be included here?
puthik_chromium 2016/11/02 23:20:38 Yes
607 NotifyDeviceChanged(device_bluez); 612 NotifyDeviceChanged(device_bluez);
608 } 613 }
609 614
610 if (property_name == properties->services_resolved.name() && 615 if (property_name == properties->services_resolved.name() &&
611 properties->services_resolved.value()) { 616 properties->services_resolved.value()) {
612 device_bluez->UpdateGattServices(object_path); 617 device_bluez->UpdateGattServices(object_path);
613 NotifyGattServicesDiscovered(device_bluez); 618 NotifyGattServicesDiscovered(device_bluez);
614 } 619 }
615 620
616 // When a device becomes paired, mark it as trusted so that the user does 621 // When a device becomes paired, mark it as trusted so that the user does
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 } else if (error_name == bluetooth_adapter::kErrorAlreadyExists) { 1703 } else if (error_name == bluetooth_adapter::kErrorAlreadyExists) {
1699 code = BluetoothServiceRecordBlueZ::ErrorCode::ERROR_RECORD_ALREADY_EXISTS; 1704 code = BluetoothServiceRecordBlueZ::ErrorCode::ERROR_RECORD_ALREADY_EXISTS;
1700 } else if (error_name == bluetooth_adapter::kErrorNotReady) { 1705 } else if (error_name == bluetooth_adapter::kErrorNotReady) {
1701 code = BluetoothServiceRecordBlueZ::ErrorCode::ERROR_ADAPTER_NOT_READY; 1706 code = BluetoothServiceRecordBlueZ::ErrorCode::ERROR_ADAPTER_NOT_READY;
1702 } 1707 }
1703 1708
1704 error_callback.Run(code); 1709 error_callback.Run(code);
1705 } 1710 }
1706 1711
1707 } // namespace bluez 1712 } // namespace bluez
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698