Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1185156 - Fix bug in resuming held call. r=hsinyi

Browse Source
This commit is contained in:
Szu-Yu Chen [:aknow] 2015-07-30 11:36:27 +08:00
parent 1ca8b1de87
commit ff6fc91fff
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/telephony/gonk/TelephonyService.js
View File

@ -1883,13 +1883,37 @@ TelephonyService.prototype = {
return;
}
// It's a foreground call.
// After hangup a single call, gecko has to resume the held call or conference.
if (!call.isConference) {
let heldCalls = this._getCallsWithState(aClientId, nsITelephonyService.CALL_STATE_HELD);
// Automatic resume another held call.
if (heldCalls.length) {
this._hangUpForeground(aClientId, aCallback);
if (call.state === nsITelephonyService.CALL_STATE_CONNECTED) {
// For a foreground call, ril has a request to do two actions together.
this._hangUpForeground(aClientId, aCallback);
} else {
// Otherwise, gecko should send out two consecutive requests by itself.
this._sendToRilWorker(aClientId, "hangUpCall", { callIndex: aCallIndex }, response => {
if (response.errorMsg) {
aCallback.notifyError(response.errorMsg);
} else {
aCallback.notifySuccess();
let emptyCallback = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsITelephonyCallback]),
notifySuccess: () => {},
notifyError: () => {}
};
if (heldCalls.length === 1) {
this.resumeCall(aClientId, heldCalls[0].callIndex, emptyCallback);
} else {
this.resumeConference(aClientId, emptyCallback);
}
}
});
}
return;
}
}