Bug 1241382 - Revise default value of BluetoothAdapter.address and BluetoothDevice.address to empty string, f=wiwang, r=shuang

This commit is contained in:
Ben Tian 2016-01-22 14:34:25 +08:00
parent 250e983ae6
commit 619f16d2b0
2 changed files with 10 additions and 2 deletions

View File

@ -458,7 +458,11 @@ BluetoothAdapter::SetPropertyByValue(const BluetoothNamedValue& aValue)
} else if (name.EqualsLiteral("Name")) {
RemoteNameToString(value.get_BluetoothRemoteName(), mName);
} else if (name.EqualsLiteral("Address")) {
AddressToString(value.get_BluetoothAddress(), mAddress);
if (value.get_BluetoothAddress().IsCleared()) {
mAddress.Truncate(); // Reset to empty string
} else {
AddressToString(value.get_BluetoothAddress(), mAddress);
}
} else if (name.EqualsLiteral("Discoverable")) {
mDiscoverable = value.get_bool();
} else if (name.EqualsLiteral("Discovering")) {

View File

@ -148,7 +148,11 @@ BluetoothDevice::SetPropertyByValue(const BluetoothNamedValue& aValue)
if (name.EqualsLiteral("Name")) {
RemoteNameToString(value.get_BluetoothRemoteName(), mName);
} else if (name.EqualsLiteral("Address")) {
AddressToString(value.get_BluetoothAddress(), mAddress);
if (value.get_BluetoothAddress().IsCleared()) {
mAddress.Truncate(); // Reset to empty string
} else {
AddressToString(value.get_BluetoothAddress(), mAddress);
}
} else if (name.EqualsLiteral("Cod")) {
mCod->Update(value.get_uint32_t());
} else if (name.EqualsLiteral("Paired")) {