diff options
| author | xdai <xdai@chromium.org> | 2015-12-10 18:53:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 02:54:25 +0000 |
| commit | e2081c0b2fac2ffccfd90a4adb153de18e0abf96 (patch) | |
| tree | 122a6c30cbd1a9c00d510eb3d1eb0604284afd4f /components/pairing | |
| parent | 74e642a43bece7db86e261a0e111a42f4243e8e9 (diff) | |
| download | chromium_src-e2081c0b2fac2ffccfd90a4adb153de18e0abf96.zip chromium_src-e2081c0b2fac2ffccfd90a4adb153de18e0abf96.tar.gz chromium_src-e2081c0b2fac2ffccfd90a4adb153de18e0abf96.tar.bz2 | |
Use kPageEnrollment for STAGE_ENROLLING for a Slave device during bootstrapping process.
BUG=564370
Review URL: https://codereview.chromium.org/1517733003
Cr-Commit-Position: refs/heads/master@{#364597}
Diffstat (limited to 'components/pairing')
| -rw-r--r-- | components/pairing/bluetooth_controller_pairing_controller.cc | 1 | ||||
| -rw-r--r-- | components/pairing/bluetooth_host_pairing_controller.cc | 1 | ||||
| -rw-r--r-- | components/pairing/pairing_api.proto | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/components/pairing/bluetooth_controller_pairing_controller.cc b/components/pairing/bluetooth_controller_pairing_controller.cc index c798bc2..2f2553a 100644 --- a/components/pairing/bluetooth_controller_pairing_controller.cc +++ b/components/pairing/bluetooth_controller_pairing_controller.cc @@ -358,6 +358,7 @@ void BluetoothControllerPairingController::OnAuthenticationDone( pairing_api::PairDevices pair_devices; pair_devices.set_api_version(kPairingAPIVersion); pair_devices.mutable_parameters()->set_admin_access_token(auth_token); + pair_devices.mutable_parameters()->set_enrolling_domain(domain); int size = 0; scoped_refptr<net::IOBuffer> io_buffer( diff --git a/components/pairing/bluetooth_host_pairing_controller.cc b/components/pairing/bluetooth_host_pairing_controller.cc index c9d5a64..088dada 100644 --- a/components/pairing/bluetooth_host_pairing_controller.cc +++ b/components/pairing/bluetooth_host_pairing_controller.cc @@ -321,6 +321,7 @@ void BluetoothHostPairingController::OnConfigureHostMessage( void BluetoothHostPairingController::OnPairDevicesMessage( const pairing_api::PairDevices& message) { DCHECK(thread_checker_.CalledOnValidThread()); + enrollment_domain_ = message.parameters().enrolling_domain(); ChangeStage(STAGE_ENROLLING); FOR_EACH_OBSERVER(Observer, observers_, EnrollHostRequested( diff --git a/components/pairing/pairing_api.proto b/components/pairing/pairing_api.proto index f0af859..22843be 100644 --- a/components/pairing/pairing_api.proto +++ b/components/pairing/pairing_api.proto @@ -62,6 +62,7 @@ message ConfigureHost { message PairDevicesParameters { optional string controller_access_token = 1; optional string admin_access_token = 2; + optional string enrolling_domain = 3; } message PairDevices { |