Bug 1011429 - [B2G][RIL] correctly update phone_state in cdma 3way call scenario. r=aknow

This commit is contained in:
Hsin-Yi Tsai 2014-05-16 17:14:11 +08:00
parent 17f6f7ffc2
commit 4c1c9bf3bb

View File

@ -748,7 +748,6 @@ TelephonyProvider.prototype = {
gSystemMessenger.broadcastMessage("telephony-call-ended", data); gSystemMessenger.broadcastMessage("telephony-call-ended", data);
aCall.clientId = aClientId; aCall.clientId = aClientId;
this._updateActiveCall(aCall, null);
let manualConfStateChange = false; let manualConfStateChange = false;
let childId = this._currentCalls[aClientId][aCall.callIndex].childId; let childId = this._currentCalls[aClientId][aCall.callIndex].childId;
@ -775,6 +774,8 @@ TelephonyProvider.prototype = {
} }
} }
this._updateActiveCall(aCall, null);
if (!aCall.failCause || if (!aCall.failCause ||
aCall.failCause === RIL.GECKO_CALL_ERROR_NORMAL_CALL_CLEARING) { aCall.failCause === RIL.GECKO_CALL_ERROR_NORMAL_CALL_CLEARING) {
this._notifyAllListeners("callStateChanged", [aClientId, this._notifyAllListeners("callStateChanged", [aClientId,