зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1132343 - Patch2: Replace setPairingConfirmation() with accept() in marionette test due to API change. r=shuang
This commit is contained in:
Родитель
6ece8f378c
Коммит
59a5aeb875
|
@ -753,15 +753,13 @@ function addEventHandlerForPairingRequest(aAdapter, aSpecifiedBdAddress) {
|
|||
|
||||
let device = evt.device;
|
||||
if (!aSpecifiedBdAddress || device.address == aSpecifiedBdAddress) {
|
||||
let confirm = true;
|
||||
|
||||
evt.handle.setPairingConfirmation(confirm).then(
|
||||
evt.handle.accept().then(
|
||||
function onResolve() {
|
||||
log(" - 'setPairingConfirmation' resolve.");
|
||||
log(" - 'accept' resolve.");
|
||||
cleanupPairingListener(aAdapter.pairingReqs);
|
||||
},
|
||||
function onReject() {
|
||||
log(" - 'setPairingConfirmation' reject.");
|
||||
log(" - 'accept' reject.");
|
||||
cleanupPairingListener(aAdapter.pairingReqs);
|
||||
});
|
||||
}
|
||||
|
@ -772,7 +770,15 @@ function addEventHandlerForPairingRequest(aAdapter, aSpecifiedBdAddress) {
|
|||
|
||||
let device = evt.device;
|
||||
if (!aSpecifiedBdAddress || device.address == aSpecifiedBdAddress) {
|
||||
cleanupPairingListener(aAdapter.pairingReqs);
|
||||
evt.handle.accept().then(
|
||||
function onResolve() {
|
||||
log(" - 'accept' resolve.");
|
||||
cleanupPairingListener(aAdapter.pairingReqs);
|
||||
},
|
||||
function onReject() {
|
||||
log(" - 'accept' reject.");
|
||||
cleanupPairingListener(aAdapter.pairingReqs);
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
// - BluetoothPairingEvent.handle
|
||||
//
|
||||
// - BluetoothPairingHandle.setPinCode()
|
||||
// - BluetoothPairingHandle.setPairingConfirmation()
|
||||
// - BluetoothPairingHandle.accept()
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче