aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-03-22 10:09:24 -0400
committerGitHub <noreply@github.com>2019-03-22 10:09:24 -0400
commit0ff87c8137030ece065f283552c28f4837cef5f3 (patch)
treea34c00facf12dba42e9c75288c41a11bd34820e6
parent525484a4d980f0f75cb0ca73e50c2347c2d24153 (diff)
parent9b3d76b82d9a4365538a1f01d71ca77925c5f768 (diff)
downloadservo-0ff87c8137030ece065f283552c28f4837cef5f3.tar.gz
servo-0ff87c8137030ece065f283552c28f4837cef5f3.zip
Auto merge of #23079 - cdeler:remove-headless-checking-from-bluetooth, r=jdm
#23065 removed unnecessary headless checking <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #23065 (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes (it's wpt tests, isn't it?) - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23079) <!-- Reviewable:end -->
-rw-r--r--components/bluetooth/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs
index 81688ef7e04..19d6db743e4 100644
--- a/components/bluetooth/lib.rs
+++ b/components/bluetooth/lib.rs
@@ -20,7 +20,6 @@ use device::bluetooth::{BluetoothAdapter, BluetoothDevice, BluetoothGATTCharacte
use device::bluetooth::{BluetoothGATTDescriptor, BluetoothGATTService};
use embedder_traits::{EmbedderMsg, EmbedderProxy};
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
-use servo_config::opts;
use servo_config::pref;
use servo_rand::{self, Rng};
use std::borrow::ToOwned;
@@ -381,7 +380,7 @@ impl BluetoothManager {
devices: Vec<BluetoothDevice>,
adapter: &BluetoothAdapter,
) -> Option<String> {
- if is_mock_adapter(adapter) || opts::get().headless {
+ if is_mock_adapter(adapter) {
for device in &devices {
if let Ok(address) = device.get_address() {
return Some(address);