Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 22:07:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1190730 - Patch 3/5: Make address-name mapping table member variable, r=joliu

Browse Source
This commit is contained in:
Ben Tian 2015-08-07 10:31:42 +08:00
parent 195a54c7fa
commit 0764f341f9
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
View File

@ -41,9 +41,6 @@
#include "mozilla/StaticMutex.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/unused.h"
#ifndef MOZ_B2G_BT_API_V1
#include "nsDataHashtable.h"
#endif
#define ENSURE_BLUETOOTH_IS_READY(runnable, result) \
do { \
@ -102,9 +99,6 @@ static nsTArray<nsRefPtr<BluetoothReplyRunnable> > sBondingRunnableArray;
static nsTArray<nsRefPtr<BluetoothReplyRunnable> > sUnbondingRunnableArray;
#ifndef MOZ_B2G_BT_API_V1
// Static hash table to map device name from address
static nsDataHashtable<nsStringHashKey, nsString> sDeviceNameMap;
static nsTArray<nsRefPtr<BluetoothReplyRunnable> > sChangeAdapterStateRunnableArray;
static nsTArray<nsRefPtr<BluetoothReplyRunnable> > sChangeDiscoveryRunnableArray;
static nsTArray<nsRefPtr<BluetoothReplyRunnable> > sFetchUuidsRunnableArray;
@ -1879,7 +1873,7 @@ BluetoothServiceBluedroid::AdapterStateChangedNotification(bool aState)
sFetchUuidsRunnableArray.Clear();
sBondingRunnableArray.Clear();
sUnbondingRunnableArray.Clear();
sDeviceNameMap.Clear();
mDeviceNameMap.Clear();
// Bluetooth scan mode is SCAN_MODE_CONNECTABLE by default, i.e., it should
// be connectable and non-discoverable.
@ -2159,8 +2153,8 @@ BluetoothServiceBluedroid::RemoteDevicePropertiesNotification(
BT_APPEND_NAMED_VALUE(propertiesArray, "Name", p.mString);
// Update <address, name> mapping
sDeviceNameMap.Remove(bdAddr);
sDeviceNameMap.Put(bdAddr, p.mString);
mDeviceNameMap.Remove(bdAddr);
mDeviceNameMap.Put(bdAddr, p.mString);
} else if (p.mType == PROPERTY_CLASS_OF_DEVICE) {
uint32_t cod = p.mUint32;
BT_APPEND_NAMED_VALUE(propertiesArray, "Cod", cod);
@ -2398,8 +2392,8 @@ BluetoothServiceBluedroid::DeviceFoundNotification(
}
// Update <address, name> mapping
sDeviceNameMap.Remove(bdAddr);
sDeviceNameMap.Put(bdAddr, bdName);
mDeviceNameMap.Remove(bdAddr);
mDeviceNameMap.Put(bdAddr, bdName);
DistributeSignal(NS_LITERAL_STRING("DeviceFound"),
NS_LITERAL_STRING(KEY_ADAPTER),
@ -2492,15 +2486,15 @@ BluetoothServiceBluedroid::PinRequestNotification(const nsAString& aRemoteBdAddr
InfallibleTArray<BluetoothNamedValue> propertiesArray;
// If |aBdName| is empty, get device name from |sDeviceNameMap|;
// If |aBdName| is empty, get device name from |mDeviceNameMap|;
// Otherwise update <address, name> mapping with |aBdName|
nsString bdAddr(aRemoteBdAddr);
nsString bdName(aBdName);
if (bdName.IsEmpty()) {
sDeviceNameMap.Get(bdAddr, &bdName);
mDeviceNameMap.Get(bdAddr, &bdName);
} else {
sDeviceNameMap.Remove(bdAddr);
sDeviceNameMap.Put(bdAddr, bdName);
mDeviceNameMap.Remove(bdAddr);
mDeviceNameMap.Put(bdAddr, bdName);
}
BT_APPEND_NAMED_VALUE(propertiesArray, "address", bdAddr);
@ -2538,15 +2532,15 @@ BluetoothServiceBluedroid::SspRequestNotification(
#ifndef MOZ_B2G_BT_API_V1
InfallibleTArray<BluetoothNamedValue> propertiesArray;
// If |aBdName| is empty, get device name from |sDeviceNameMap|;
// If |aBdName| is empty, get device name from |mDeviceNameMap|;
// Otherwise update <address, name> mapping with |aBdName|
nsString bdAddr(aRemoteBdAddr);
nsString bdName(aBdName);
if (bdName.IsEmpty()) {
sDeviceNameMap.Get(bdAddr, &bdName);
mDeviceNameMap.Get(bdAddr, &bdName);
} else {
sDeviceNameMap.Remove(bdAddr);
sDeviceNameMap.Put(bdAddr, bdName);
mDeviceNameMap.Remove(bdAddr);
mDeviceNameMap.Put(bdAddr, bdName);
}
/**
@ -2640,7 +2634,7 @@ BluetoothServiceBluedroid::BondStateChangedNotification(
// Query pairing device name from hash table
nsString remoteBdAddr(aRemoteBdAddr);
nsString remotebdName;
sDeviceNameMap.Get(remoteBdAddr, &remotebdName);
mDeviceNameMap.Get(remoteBdAddr, &remotebdName);
// Update bonded address array and append pairing device name
InfallibleTArray<BluetoothNamedValue> propertiesArray;

9
dom/bluetooth/bluedroid/BluetoothServiceBluedroid.h
View File

@ -10,6 +10,9 @@
#include "BluetoothCommon.h"
#include "BluetoothInterface.h"
#include "BluetoothService.h"
#ifndef MOZ_B2G_BT_API_V1
#include "nsDataHashtable.h"
#endif
BEGIN_BLUETOOTH_NAMESPACE
@ -407,6 +410,12 @@ protected:
// Backend error recovery
bool mIsRestart;
bool mIsFirstTimeToggleOffBt;
#ifndef MOZ_B2G_BT_API_V1
// <address, name> mapping table for remote devices
nsDataHashtable<nsStringHashKey, nsString> mDeviceNameMap;
#endif
};
END_BLUETOOTH_NAMESPACE