resolve merge conflicts of f7388e6 to nyc-dev

[android-x86/system-bt.git] / service / adapter.cpp

diff --git a/service/adapter.cpp b/service/adapter.cpp
index 891bc08..45826b2 100644 (file)
--- a/service/adapter.cpp
+++ b/service/adapter.cpp
@@ -105,7 +105,7 @@ class AdapterImpl : public Adapter,
     return state_.load() == ADAPTER_STATE_ON;
   }
 
-  bool Enable() override {
+  bool Enable(bool start_restricted) override {
     AdapterState current_state = GetState();
     if (current_state != ADAPTER_STATE_OFF) {
       LOG(INFO) << "Adapter not disabled - state: "
@@ -118,7 +118,7 @@ class AdapterImpl : public Adapter,
     state_ = ADAPTER_STATE_TURNING_ON;
     NotifyAdapterStateChanged(current_state, state_);
 
-    int status = hal::BluetoothInterface::Get()->GetHALInterface()->enable();
+    int status = hal::BluetoothInterface::Get()->GetHALInterface()->enable(start_restricted);
     if (status != BT_STATUS_SUCCESS) {
       LOG(ERROR) << "Failed to enable Bluetooth - status: "
                  << BtStatusText((const bt_status_t)status);