| Index: device/bluetooth/bluetooth_adapter_factory_wrapper.cc
|
| diff --git a/device/bluetooth/bluetooth_adapter_factory_wrapper.cc b/device/bluetooth/bluetooth_adapter_factory_wrapper.cc
|
| index e4b858a04c600bd9618e7d226ec8a9df17bb40fd..722fb247e4851b012ada60d855ff3a082186dc8c 100644
|
| --- a/device/bluetooth/bluetooth_adapter_factory_wrapper.cc
|
| +++ b/device/bluetooth/bluetooth_adapter_factory_wrapper.cc
|
| @@ -35,9 +35,12 @@ BluetoothAdapterFactoryWrapper& BluetoothAdapterFactoryWrapper::Get() {
|
| return g_singleton.Get();
|
| }
|
|
|
| -bool BluetoothAdapterFactoryWrapper::IsBluetoothAdapterAvailable() {
|
| +bool BluetoothAdapterFactoryWrapper::IsLowEnergyAvailable() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - return BluetoothAdapterFactory::IsBluetoothAdapterAvailable();
|
| + if (adapter_ != nullptr) {
|
| + return true;
|
| + }
|
| + return BluetoothAdapterFactory::IsLowEnergyAvailable();
|
| }
|
|
|
| void BluetoothAdapterFactoryWrapper::AcquireAdapter(
|
| @@ -53,7 +56,7 @@ void BluetoothAdapterFactoryWrapper::AcquireAdapter(
|
| return;
|
| }
|
|
|
| - DCHECK(BluetoothAdapterFactory::IsBluetoothAdapterAvailable());
|
| + DCHECK(BluetoothAdapterFactory::IsLowEnergyAvailable());
|
| BluetoothAdapterFactory::GetAdapter(
|
| base::Bind(&BluetoothAdapterFactoryWrapper::OnGetAdapter,
|
| weak_ptr_factory_.GetWeakPtr(), callback));
|
|
|