diff options
| author | zork <zork@chromium.org> | 2015-04-30 20:20:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 03:20:43 +0000 |
| commit | 01205e6c626677993322a481beec2a038bf8be57 (patch) | |
| tree | 2cca5a38eca15350d79e7156e62a806f28def772 /components/pairing/bluetooth_host_pairing_controller.cc | |
| parent | 0a91bd01ecfce5c752ded50c704d971af52db814 (diff) | |
| download | chromium_src-01205e6c626677993322a481beec2a038bf8be57.zip chromium_src-01205e6c626677993322a481beec2a038bf8be57.tar.gz chromium_src-01205e6c626677993322a481beec2a038bf8be57.tar.bz2 | |
Add permanent_id to pairing protocol.
BUG=483304
Review URL: https://codereview.chromium.org/1118173002
Cr-Commit-Position: refs/heads/master@{#327873}
Diffstat (limited to 'components/pairing/bluetooth_host_pairing_controller.cc')
| -rw-r--r-- | components/pairing/bluetooth_host_pairing_controller.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/components/pairing/bluetooth_host_pairing_controller.cc b/components/pairing/bluetooth_host_pairing_controller.cc index 580d92f..c8246b1 100644 --- a/components/pairing/bluetooth_host_pairing_controller.cc +++ b/components/pairing/bluetooth_host_pairing_controller.cc @@ -87,6 +87,8 @@ void BluetoothHostPairingController::SendHostStatus() { host_status.set_api_version(kPairingAPIVersion); if (!enrollment_domain_.empty()) host_status.mutable_parameters()->set_domain(enrollment_domain_); + if (!permanent_id_.empty()) + host_status.mutable_parameters()->set_permanent_id(permanent_id_); // TODO(zork): Get these values from the UI. (http://crbug.com/405744) host_status.mutable_parameters()->set_connectivity( @@ -420,6 +422,11 @@ void BluetoothHostPairingController::OnEnrollmentStatusChanged( SendHostStatus(); } +void BluetoothHostPairingController::SetPermanentId( + const std::string& permanent_id) { + permanent_id_ = permanent_id; +} + void BluetoothHostPairingController::RequestPinCode( device::BluetoothDevice* device) { // Disallow unknown device. |