--- a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
@@ -31,30 +31,30 @@
#include "BluetoothUtils.h"
#include "BluetoothUuid.h"
#include "mozilla/dom/bluetooth/BluetoothTypes.h"
#include "mozilla/ipc/SocketBase.h"
#include "mozilla/StaticMutex.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/unused.h"
-#define ENSURE_BLUETOOTH_IS_READY(runnable, result) \
+#define ENSURE_BLUETOOTH_IS_ENABLED(runnable, result) \
do { \
- if (!sBtInterface || !IsEnabled()) { \
+ if (!IsEnabled()) { \
DispatchReplyError(runnable, \
- NS_LITERAL_STRING("Bluetooth is not ready")); \
+ NS_LITERAL_STRING("Bluetooth is not enabled")); \
return result; \
} \
} while(0)
-#define ENSURE_BLUETOOTH_IS_READY_VOID(runnable) \
+#define ENSURE_BLUETOOTH_IS_ENABLED_VOID(runnable) \
do { \
- if (!sBtInterface || !IsEnabled()) { \
+ if (!IsEnabled()) { \
DispatchReplyError(runnable, \
- NS_LITERAL_STRING("Bluetooth is not ready")); \
+ NS_LITERAL_STRING("Bluetooth is not enabled")); \
return; \
} \
} while(0)
#define ENSURE_GATT_MGR_IS_READY_VOID(gatt, runnable) \
do { \
if (!gatt) { \
DispatchReplyError(runnable, \
@@ -335,151 +335,151 @@ BluetoothServiceBluedroid::StopInternal(
//
void
BluetoothServiceBluedroid::StartLeScanInternal(
const nsTArray<BluetoothUuid>& aServiceUuids,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->StartLeScan(aServiceUuids, aRunnable);
}
void
BluetoothServiceBluedroid::StopLeScanInternal(
const BluetoothUuid& aScanUuid,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->StopLeScan(aScanUuid, aRunnable);
}
void
BluetoothServiceBluedroid::ConnectGattClientInternal(
const BluetoothUuid& aAppUuid, const BluetoothAddress& aDeviceAddress,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->Connect(aAppUuid, aDeviceAddress, aRunnable);
}
void
BluetoothServiceBluedroid::DisconnectGattClientInternal(
const BluetoothUuid& aAppUuid, const BluetoothAddress& aDeviceAddress,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->Disconnect(aAppUuid, aDeviceAddress, aRunnable);
}
void
BluetoothServiceBluedroid::DiscoverGattServicesInternal(
const BluetoothUuid& aAppUuid, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->Discover(aAppUuid, aRunnable);
}
void
BluetoothServiceBluedroid::GattClientStartNotificationsInternal(
const BluetoothUuid& aAppUuid, const BluetoothGattServiceId& aServId,
const BluetoothGattId& aCharId, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->RegisterNotifications(aAppUuid, aServId, aCharId, aRunnable);
}
void
BluetoothServiceBluedroid::GattClientStopNotificationsInternal(
const BluetoothUuid& aAppUuid, const BluetoothGattServiceId& aServId,
const BluetoothGattId& aCharId, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->DeregisterNotifications(aAppUuid, aServId, aCharId, aRunnable);
}
void
BluetoothServiceBluedroid::UnregisterGattClientInternal(
int aClientIf, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->UnregisterClient(aClientIf, aRunnable);
}
void
BluetoothServiceBluedroid::GattClientReadRemoteRssiInternal(
int aClientIf, const BluetoothAddress& aDeviceAddress,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ReadRemoteRssi(aClientIf, aDeviceAddress, aRunnable);
}
void
BluetoothServiceBluedroid::GattClientReadCharacteristicValueInternal(
const BluetoothUuid& aAppUuid,
const BluetoothGattServiceId& aServiceId,
const BluetoothGattId& aCharacteristicId,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ReadCharacteristicValue(aAppUuid, aServiceId, aCharacteristicId,
aRunnable);
}
@@ -489,17 +489,17 @@ BluetoothServiceBluedroid::GattClientWri
const BluetoothGattServiceId& aServiceId,
const BluetoothGattId& aCharacteristicId,
const BluetoothGattWriteType& aWriteType,
const nsTArray<uint8_t>& aValue,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->WriteCharacteristicValue(aAppUuid, aServiceId, aCharacteristicId,
aWriteType, aValue, aRunnable);
}
@@ -508,17 +508,17 @@ BluetoothServiceBluedroid::GattClientRea
const BluetoothUuid& aAppUuid,
const BluetoothGattServiceId& aServiceId,
const BluetoothGattId& aCharacteristicId,
const BluetoothGattId& aDescriptorId,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ReadDescriptorValue(aAppUuid, aServiceId, aCharacteristicId,
aDescriptorId, aRunnable);
}
@@ -528,97 +528,97 @@ BluetoothServiceBluedroid::GattClientWri
const BluetoothGattServiceId& aServiceId,
const BluetoothGattId& aCharacteristicId,
const BluetoothGattId& aDescriptorId,
const nsTArray<uint8_t>& aValue,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->WriteDescriptorValue(aAppUuid, aServiceId, aCharacteristicId,
aDescriptorId, aValue, aRunnable);
}
// GATT Server
void
BluetoothServiceBluedroid::GattServerConnectPeripheralInternal(
const BluetoothUuid& aAppUuid, const BluetoothAddress& aAddress,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ConnectPeripheral(aAppUuid, aAddress, aRunnable);
}
void
BluetoothServiceBluedroid::GattServerDisconnectPeripheralInternal(
const BluetoothUuid& aAppUuid, const BluetoothAddress& aAddress,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->DisconnectPeripheral(aAppUuid, aAddress, aRunnable);
}
void
BluetoothServiceBluedroid::UnregisterGattServerInternal(
int aServerIf, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->UnregisterServer(aServerIf, aRunnable);
}
void
BluetoothServiceBluedroid::GattServerAddServiceInternal(
const BluetoothUuid& aAppUuid,
const BluetoothGattServiceId& aServiceId,
uint16_t aHandleCount,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerAddService(aAppUuid, aServiceId, aHandleCount, aRunnable);
}
void
BluetoothServiceBluedroid::GattServerAddIncludedServiceInternal(
const BluetoothUuid& aAppUuid,
const BluetoothAttributeHandle& aServiceHandle,
const BluetoothAttributeHandle& aIncludedServiceHandle,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerAddIncludedService(aAppUuid,
aServiceHandle,
aIncludedServiceHandle,
aRunnable);
@@ -630,17 +630,17 @@ BluetoothServiceBluedroid::GattServerAdd
const BluetoothAttributeHandle& aServiceHandle,
const BluetoothUuid& aCharacteristicUuid,
BluetoothGattAttrPerm aPermissions,
BluetoothGattCharProp aProperties,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerAddCharacteristic(aAppUuid,
aServiceHandle,
aCharacteristicUuid,
aPermissions,
@@ -654,17 +654,17 @@ BluetoothServiceBluedroid::GattServerAdd
const BluetoothAttributeHandle& aServiceHandle,
const BluetoothAttributeHandle& aCharacteristicHandle,
const BluetoothUuid& aDescriptorUuid,
BluetoothGattAttrPerm aPermissions,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerAddDescriptor(aAppUuid,
aServiceHandle,
aCharacteristicHandle,
aDescriptorUuid,
@@ -675,49 +675,49 @@ BluetoothServiceBluedroid::GattServerAdd
void
BluetoothServiceBluedroid::GattServerRemoveServiceInternal(
const BluetoothUuid& aAppUuid,
const BluetoothAttributeHandle& aServiceHandle,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerRemoveService(aAppUuid, aServiceHandle, aRunnable);
}
void
BluetoothServiceBluedroid::GattServerStartServiceInternal(
const BluetoothUuid& aAppUuid,
const BluetoothAttributeHandle& aServiceHandle,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerStartService(aAppUuid, aServiceHandle, aRunnable);
}
void
BluetoothServiceBluedroid::GattServerStopServiceInternal(
const BluetoothUuid& aAppUuid,
const BluetoothAttributeHandle& aServiceHandle,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerStopService(aAppUuid, aServiceHandle, aRunnable);
}
void
@@ -726,17 +726,17 @@ BluetoothServiceBluedroid::GattServerSen
const BluetoothAddress& aAddress,
uint16_t aStatus,
int32_t aRequestId,
const BluetoothGattResponse& aRsp,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerSendResponse(
aAppUuid, aAddress, aStatus, aRequestId, aRsp, aRunnable);
}
@@ -746,17 +746,17 @@ BluetoothServiceBluedroid::GattServerSen
const BluetoothAddress& aAddress,
const BluetoothAttributeHandle& aCharacteristicHandle,
bool aConfirm,
const nsTArray<uint8_t>& aValue,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothGattManager* gatt = BluetoothGattManager::Get();
ENSURE_GATT_MGR_IS_READY_VOID(gatt, aRunnable);
gatt->ServerSendIndication(aAppUuid,
aAddress,
aCharacteristicHandle,
aConfirm,
@@ -864,17 +864,17 @@ private:
};
nsresult
BluetoothServiceBluedroid::GetConnectedDevicePropertiesInternal(
uint16_t aServiceUuid, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY(aRunnable, NS_OK);
+ ENSURE_BLUETOOTH_IS_ENABLED(aRunnable, NS_OK);
BluetoothProfileManagerBase* profile =
BluetoothUuidHelper::GetBluetoothProfileManager(aServiceUuid);
if (!profile) {
DispatchReplyError(aRunnable, NS_LITERAL_STRING(ERR_UNKNOWN_PROFILE));
return NS_OK;
}
@@ -900,17 +900,17 @@ BluetoothServiceBluedroid::GetConnectedD
nsresult
BluetoothServiceBluedroid::GetPairedDevicePropertiesInternal(
const nsTArray<BluetoothAddress>& aDeviceAddress,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY(aRunnable, NS_OK);
+ ENSURE_BLUETOOTH_IS_ENABLED(aRunnable, NS_OK);
if (aDeviceAddress.IsEmpty()) {
DispatchReplySuccess(aRunnable);
return NS_OK;
}
// Append request of all paired devices
GetDeviceRequest request(aDeviceAddress.Length(), aRunnable);
@@ -952,30 +952,30 @@ private:
BluetoothReplyRunnable* mRunnable;
};
void
BluetoothServiceBluedroid::StartDiscoveryInternal(
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
mChangeDiscoveryRunnables.AppendElement(aRunnable);
sBtCoreInterface->StartDiscovery(
new DispatchReplyErrorResultHandler(mChangeDiscoveryRunnables, aRunnable));
}
nsresult
BluetoothServiceBluedroid::FetchUuidsInternal(
const BluetoothAddress& aDeviceAddress, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY(aRunnable, NS_OK);
+ ENSURE_BLUETOOTH_IS_ENABLED(aRunnable, NS_OK);
/*
* get_remote_services request will not be performed by bluedroid
* if it is currently discovering nearby remote devices.
*/
if (mDiscovering) {
StopDiscoveryInternal(aRunnable);
}
@@ -988,31 +988,31 @@ BluetoothServiceBluedroid::FetchUuidsInt
}
void
BluetoothServiceBluedroid::StopDiscoveryInternal(
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
mChangeDiscoveryRunnables.AppendElement(aRunnable);
sBtCoreInterface->CancelDiscovery(
new DispatchReplyErrorResultHandler(mChangeDiscoveryRunnables, aRunnable));
}
nsresult
BluetoothServiceBluedroid::SetProperty(BluetoothObjectType aType,
const BluetoothNamedValue& aValue,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY(aRunnable, NS_OK);
+ ENSURE_BLUETOOTH_IS_ENABLED(aRunnable, NS_OK);
BluetoothProperty property;
nsresult rv = NamedValueToProperty(aValue, property);
if (NS_FAILED(rv)) {
DispatchReplyError(aRunnable, STATUS_PARM_INVALID);
return rv;
}
@@ -1217,32 +1217,32 @@ BluetoothServiceBluedroid::UpdateSdpReco
nsresult
BluetoothServiceBluedroid::CreatePairedDeviceInternal(
const BluetoothAddress& aDeviceAddress, int aTimeout,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY(aRunnable, NS_OK);
+ ENSURE_BLUETOOTH_IS_ENABLED(aRunnable, NS_OK);
mCreateBondRunnables.AppendElement(aRunnable);
sBtCoreInterface->CreateBond(aDeviceAddress, TRANSPORT_AUTO,
new DispatchReplyErrorResultHandler(mCreateBondRunnables, aRunnable));
return NS_OK;
}
nsresult
BluetoothServiceBluedroid::RemoveDeviceInternal(
const BluetoothAddress& aDeviceAddress, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY(aRunnable, NS_OK);
+ ENSURE_BLUETOOTH_IS_ENABLED(aRunnable, NS_OK);
mRemoveBondRunnables.AppendElement(aRunnable);
sBtCoreInterface->RemoveBond(aDeviceAddress,
new DispatchReplyErrorResultHandler(mRemoveBondRunnables, aRunnable));
return NS_OK;
}
@@ -1270,17 +1270,17 @@ private:
void
BluetoothServiceBluedroid::PinReplyInternal(
const BluetoothAddress& aDeviceAddress, bool aAccept,
const BluetoothPinCode& aPinCode, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
sBtCoreInterface->PinReply(aDeviceAddress, aAccept, aPinCode,
new PinReplyResultHandler(aRunnable));
}
void
BluetoothServiceBluedroid::SetPinCodeInternal(
const BluetoothAddress& aDeviceAddress, const BluetoothPinCode& aPinCode,
@@ -1321,17 +1321,17 @@ private:
void
BluetoothServiceBluedroid::SspReplyInternal(
const BluetoothAddress& aDeviceAddress, BluetoothSspVariant aVariant,
bool aAccept, BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
sBtCoreInterface->SspReply(aDeviceAddress, aVariant, aAccept,
0 /* passkey */,
new SspReplyResultHandler(aRunnable));
}
void
BluetoothServiceBluedroid::SetPairingConfirmationInternal(
@@ -1528,17 +1528,17 @@ BluetoothServiceBluedroid::IsScoConnecte
}
void
BluetoothServiceBluedroid::SetObexPassword(const nsAString& aPassword,
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothPbapManager* pbap = BluetoothPbapManager::Get();
if (!pbap) {
DispatchReplyError(aRunnable,
NS_LITERAL_STRING("Failed to set OBEX password"));
return;
}
@@ -1547,17 +1547,17 @@ BluetoothServiceBluedroid::SetObexPasswo
}
void
BluetoothServiceBluedroid::RejectObexAuth(
BluetoothReplyRunnable* aRunnable)
{
MOZ_ASSERT(NS_IsMainThread());
- ENSURE_BLUETOOTH_IS_READY_VOID(aRunnable);
+ ENSURE_BLUETOOTH_IS_ENABLED_VOID(aRunnable);
BluetoothPbapManager* pbap = BluetoothPbapManager::Get();
if (!pbap) {
DispatchReplyError(aRunnable,
NS_LITERAL_STRING("Failed to reject OBEX authentication request"));
return;
}
@@ -2033,18 +2033,16 @@ BluetoothServiceBluedroid::AdapterStateC
mSetAdapterPropertyRunnables.Clear();
mFetchUuidsRunnables.Clear();
mCreateBondRunnables.Clear();
mRemoveBondRunnables.Clear();
mDeviceNameMap.Clear();
// Bluetooth scan mode is SCAN_MODE_CONNECTABLE by default, i.e., it should
// be connectable and non-discoverable.
- NS_ENSURE_TRUE_VOID(sBtCoreInterface);
-
sBtCoreInterface->SetAdapterProperty(
BluetoothProperty(PROPERTY_ADAPTER_SCAN_MODE, SCAN_MODE_CONNECTABLE),
new SetAdapterPropertyDiscoverableResultHandler());
// Trigger OPP & PBAP managers to listen
BluetoothOppManager* opp = BluetoothOppManager::Get();
if (!opp || !opp->Listen()) {
BT_LOGR("Fail to start BluetoothOppManager listening");