From 7e475431dcc7d5f0563aefbb84da0024d7c7c746 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 14:00:23 -0700 Subject: [PATCH 1/3] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/553715baac40 Author: Jonathan Griffin Desc: Merge pull request #11407 from ahal/xulrunner Bug 902496 - Update copy of xulrunner-sdk being used ======== https://hg.mozilla.org/integration/gaia-central/rev/8d6106f716c6 Author: Andrew Halberstadt Desc: Bug 902496 - Update copy of xulrunner-sdk being used, r=jgriffin --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 2697277bbc2f..40427757f25b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "acd53f668718d06090805303ed85e36dddf61853", + "revision": "553715baac409aa4f12fee8413450986341c672e", "repo_path": "/integration/gaia-central" } From b36a834ee4c409173c167d04d8a15ec04a08807d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 14:45:23 -0700 Subject: [PATCH 2/3] Bumping gaia.json for 4 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/b6408d2d9046 Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #11254 from nullaus/market-customizations Market customizations helper object and base test case ======== https://hg.mozilla.org/integration/gaia-central/rev/95614e3fffab Author: Ghislain 'Aus' Lacroix Desc: bug 892153 Create Operator Variant Helper and base tests for Market Customization work. Object enables customization of settings and other application data on first SIM insertion AND during SIM changes at runtime if so desired. r=timdream, julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/8ebf016ddc47 Author: Jonathan Griffin Desc: Merge pull request #11410 from jonallengriffin/902641 Bug 902641 - Disable contacts_list_test.js for frequent TBPL orange, a=t... ======== https://hg.mozilla.org/integration/gaia-central/rev/5b3a5f923cb9 Author: Jonathan Griffin Desc: Bug 902641 - Disable contacts_list_test.js for frequent TBPL orange, a=test-only --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 40427757f25b..f1be475c60d9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "553715baac409aa4f12fee8413450986341c672e", + "revision": "b6408d2d9046c04d4f0da61fb12549127fd67a13", "repo_path": "/integration/gaia-central" } From 25642de5150bb51751090b6304b6811da89062cc Mon Sep 17 00:00:00 2001 From: Jose Antonio Olivera Ortega Date: Thu, 8 Aug 2013 00:47:34 +0200 Subject: [PATCH 3/3] Bug 894871 - [User Story] [Suplementary Services] Temporary MMI codes: support calling line identification restriction (+CLIR). r=hsinyi --- dom/system/gonk/ril_worker.js | 46 ++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 734fc425cdfe..0828a0d17c8d 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -1497,6 +1497,25 @@ let RIL = { Buf.simpleRequest(REQUEST_GET_CLIR, options); }, + /** + * Returns when to hide or show the caller id in the call. + * + * @param mmi + * The MMI code. + * @return One of the CLIR_* constants. + */ + _getCLIRMode: function _getCLIRMode(mmi) { + if (!mmi || + (mmi.serviceCode != MMI_SC_CLIR) || + (mmi.procedure != MMI_PROCEDURE_ACTIVATION && + mmi.procedure != MMI_PROCEDURE_DEACTIVATION)) { + return CLIR_DEFAULT; + } + + return mmi.procedure == MMI_PROCEDURE_ACTIVATION ? CLIR_INVOCATION : + CLIR_SUPPRESSION; + }, + /** * Enables or disables the presentation of the calling line identity (CLI) to * the called party when originating a call. @@ -1755,7 +1774,7 @@ let RIL = { * @param number * String containing the number to dial. * @param clirMode - * Integer doing something XXX TODO + * Integer for showing/hidding the caller Id to the called party. * @param uusInfo * Integer doing something XXX TODO */ @@ -1770,6 +1789,14 @@ let RIL = { if (this._isEmergencyNumber(options.number)) { this.dialEmergencyNumber(options, onerror); } else { + // TODO: Both dial() and sendMMI() functions should be unified at some + // point in the future. In the mean time we handle temporary CLIR MMI + // commands through the dial() function. Please see bug 889737. + let mmi = this._parseMMI(options.number); + if (mmi && this._isTemporaryModeCLIR(mmi)) { + options.number = mmi.dialNumber; + options.clirMode = this._getCLIRMode(mmi); + } this.dialNonEmergencyNumber(options, onerror); } }, @@ -2539,6 +2566,9 @@ let RIL = { return; // CLIR (non-temporary ones) + // TODO: Both dial() and sendMMI() functions should be unified at some + // point in the future. In the mean time we handle temporary CLIR MMI + // commands through the dial() function. Please see bug 889737. case MMI_SC_CLIR: options.mmiServiceCode = MMI_KS_SC_CLIR; options.procedure = mmi.procedure; @@ -3155,6 +3185,20 @@ let RIL = { return numbers.indexOf(number) != -1; }, + /** + * Checks whether to temporarily suppress caller id for the call. + * + * @param mmi + * MMI full object. + */ + _isTemporaryModeCLIR: function _isTemporaryModeCLIR(mmi) { + return (mmi && + mmi.serviceCode == MMI_SC_CLIR && + mmi.dialNumber && + (mmi.procedure == MMI_PROCEDURE_ACTIVATION || + mmi.procedure == MMI_PROCEDURE_DEACTIVATION)); + }, + /** * Report STK Service is running. */