From 44e81e91c7529bf3dd3a395b14aeaa439e8c8efc Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Mon, 15 Jul 2013 08:54:22 -0400 Subject: [PATCH] Bug 881142 - Part 4: Remove call state busy (RIL). r=hsinyi --- dom/system/gonk/RadioInterfaceLayer.js | 2 -- dom/system/gonk/ril_consts.js | 1 - dom/system/gonk/ril_worker.js | 5 ----- 3 files changed, 8 deletions(-) diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index 16d9bdaca00a..ef6bec53a110 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -194,8 +194,6 @@ function convertRILCallState(state) { case RIL.CALL_STATE_INCOMING: case RIL.CALL_STATE_WAITING: return nsITelephonyProvider.CALL_STATE_INCOMING; - case RIL.CALL_STATE_BUSY: - return nsITelephonyProvider.CALL_STATE_BUSY; default: throw new Error("Unknown rilCallState: " + state); } diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js index d77997f1dcbb..cc006a3ce9cf 100644 --- a/dom/system/gonk/ril_consts.js +++ b/dom/system/gonk/ril_consts.js @@ -442,7 +442,6 @@ this.CALL_STATE_DIALING = 2; this.CALL_STATE_ALERTING = 3; this.CALL_STATE_INCOMING = 4; this.CALL_STATE_WAITING = 5; -this.CALL_STATE_BUSY = 6; this.TOA_INTERNATIONAL = 0x91; this.TOA_UNKNOWN = 0x81; diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 5cda64cadec1..807a811853f7 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -4690,11 +4690,6 @@ RIL[REQUEST_LAST_CALL_FAIL_CAUSE] = function REQUEST_LAST_CALL_FAIL_CAUSE(length case CALL_FAIL_NORMAL: this._handleDisconnectedCall(options); break; - case CALL_FAIL_BUSY: - options.state = CALL_STATE_BUSY; - this._handleChangedCallState(options); - this._handleDisconnectedCall(options); - break; default: options.rilMessageType = "callError"; options.errorMsg = RIL_CALL_FAILCAUSE_TO_GECKO_CALL_ERROR[failCause];