Bug 1031252 - Patch: Reject promise for setProperty requests if BT is not enabled. r=btian

This commit is contained in:
Jocelyn Liu 2014-07-02 09:41:33 +08:00
parent 8d73546b3f
commit df8c5674c3

View File

@ -449,6 +449,11 @@ BluetoothAdapter::SetName(const nsAString& aName, ErrorResult& aRv)
nsRefPtr<Promise> promise = new Promise(global);
if (mState != BluetoothAdapterState::Enabled) {
promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR);
return promise.forget();
}
if (mName.Equals(aName)) {
// Need to resolved with "undefined" since this method is Promise<void>
promise->MaybeResolve(JS::UndefinedHandleValue);
@ -488,6 +493,11 @@ BluetoothAdapter::SetDiscoverable(bool aDiscoverable, ErrorResult& aRv)
nsRefPtr<Promise> promise = new Promise(global);
if (mState != BluetoothAdapterState::Enabled) {
promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR);
return promise.forget();
}
if (aDiscoverable == mDiscoverable) {
// Need to resolved with "undefined" since this method is Promise<void>
promise->MaybeResolve(JS::UndefinedHandleValue);