From c025426231aff55e7a0905443a1565422974e3b4 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 22 Aug 2013 00:45:21 -0700 Subject: [PATCH 1/6] Bumping gaia.json for 2 gaia-central revision(s) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/18f4d44024b0 Author: Fernando Rodríguez Sela Desc: Merge pull request #11664 from lissyx/bug907629 Bug 907629 - Notify STK application when Settings is about to get killed, r=frsela ======== https://hg.mozilla.org/integration/gaia-central/rev/5440da5e1422 Author: Alexandre Lissy Desc: Bug 907629 - Notify STK application when Settings is about to get killed It seems like doing it in the onunload callback is already too late, and it makes the STK behaving wrongly. --- 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 c994a7ff1cab..65e588135e06 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "5de9f5b9b2f843825f13bd3667dc0fbf2e04e5f3", + "revision": "18f4d44024b059c43b6edc664a9565fb8d337ab2", "repo_path": "/integration/gaia-central" } From 683b54505e10f82db3aa91bfaf974790b89d3f21 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 22 Aug 2013 01:20:21 -0700 Subject: [PATCH 2/6] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/73a4dfee4833 Author: James Lal Desc: Merge pull request #11686 from lightsofapollo/fix-integration Bug 908092 - Fix regression caused by ./bin/marionette change in 612e786... ======== https://hg.mozilla.org/integration/gaia-central/rev/e9edf10912c5 Author: James Lal Desc: Bug 908092 - Fix regression caused by ./bin/marionette change in 612e786f22dc1deb31489facdd0ae633440109ba --- 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 65e588135e06..d395a07efa20 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "18f4d44024b059c43b6edc664a9565fb8d337ab2", + "revision": "73a4dfee4833d2175a6215eb714b6018918a019b", "repo_path": "/integration/gaia-central" } From 182090f5f30188106794cdea05257175e9b4e9e0 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 22 Aug 2013 01:45:21 -0700 Subject: [PATCH 3/6] Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/3d38c67a7874 Author: Julien Wajsberg Desc: Bug 906316 - Don't download the xulrunner SDK each time we change a branch if their configuration are different r=yurenju This also shows a message when the archive file seems to be corrupted, advising to run "make really-clean". Also changed "make really-clean" to remove all xulrunner related files. We now uncompress the archive directly in a specific directory that should change when we change the URL. We use a dot file inside the xulrunner SDK directory to keep the URL used to download that SDK. This _will_ make all devs redownload XULRunner, sorry. --- 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 d395a07efa20..c555c8b8effe 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "73a4dfee4833d2175a6215eb714b6018918a019b", + "revision": "3d38c67a7874f0337428c7d034215df89c10b1a2", "repo_path": "/integration/gaia-central" } From afc8e204ab774e1bb7e8025dbd4f0a14aa1aac8e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 22 Aug 2013 02:40:21 -0700 Subject: [PATCH 4/6] Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/b1c24376938a Author: Caio Lima Desc: Bug 906544 - Renamed the the global Notification object to Notify r=julien --- 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 c555c8b8effe..ab19da5ee131 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "3d38c67a7874f0337428c7d034215df89c10b1a2", + "revision": "b1c24376938a0d487679913fcb7bc12879deb6b0", "repo_path": "/integration/gaia-central" } From 0dec9ded73e20eec011066fc5397d121bc00d9c9 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 22 Aug 2013 03:00:22 -0700 Subject: [PATCH 5/6] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/1c2a9f12dc45 Author: steveck-chung Desc: Merge pull request #11522 from steveck-chung/Bug-898726 Bug 898726 -[SMS]Manual inputed receiver's phone number will be overrided after select receiver from contacts. r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/8327c30888ec Author: Steve Chung Desc: Bug 898726 -[SMS]Manual inputed receiver's phone number will be overrided after select receiver from contacts --- 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 ab19da5ee131..4ae34ade87bc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b1c24376938a0d487679913fcb7bc12879deb6b0", + "revision": "1c2a9f12dc455ae671b15d8eb9d49ee901d4e3a6", "repo_path": "/integration/gaia-central" } From e623140a57f690378a03fac623b34ec8b642c06a Mon Sep 17 00:00:00 2001 From: Jessica Jong Date: Thu, 22 Aug 2013 18:06:36 +0800 Subject: [PATCH 6/6] Bug 832808 - B2G Multi-SIM: To support data call function for multi-SIM. r=vicamo --- dom/system/gonk/RadioInterfaceLayer.js | 97 +++++++++++++------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index 0e02e2ac089f..2d3c15bbafbc 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -1516,55 +1516,51 @@ RadioInterface.prototype = { * the APN setting via APN types. */ updateApnSettings: function updateApnSettings(allApnSettings) { - // TODO: Support multi-SIM, bug 799023. - let simNumber = 1; - for (let simId = 0; simId < simNumber; simId++) { - let thisSimApnSettings = allApnSettings[simId]; - if (!thisSimApnSettings) { - return; + let thisSimApnSettings = allApnSettings[this.clientId]; + if (!thisSimApnSettings) { + return; + } + + // Clear old APN settings. + for each (let apnSetting in this.apnSettings.byAPN) { + // Clear all connections of this APN settings. + for each (let type in apnSetting.types) { + if (this.getDataCallStateByType(type) == + RIL.GECKO_NETWORK_STATE_CONNECTED) { + this.deactivateDataCallByType(type); + } + } + if (apnSetting.iface.name in gNetworkManager.networkInterfaces) { + gNetworkManager.unregisterNetworkInterface(apnSetting.iface); + } + this.unregisterDataCallCallback(apnSetting.iface); + delete apnSetting.iface; + } + this.apnSettings.byAPN = {}; + this.apnSettings.byType = {}; + + // Create new APN settings. + for (let apnIndex = 0; thisSimApnSettings[apnIndex]; apnIndex++) { + let inputApnSetting = thisSimApnSettings[apnIndex]; + if (!this.validateApnSetting(inputApnSetting)) { + continue; } - // Clear old APN settings. - for each (let apnSetting in this.apnSettings.byAPN) { - // Clear all connections of this APN settings. - for each (let type in apnSetting.types) { - if (this.getDataCallStateByType(type) == - RIL.GECKO_NETWORK_STATE_CONNECTED) { - this.deactivateDataCallByType(type); - } - } - if (apnSetting.iface.name in gNetworkManager.networkInterfaces) { - gNetworkManager.unregisterNetworkInterface(apnSetting.iface); - } - this.unregisterDataCallCallback(apnSetting.iface); - delete apnSetting.iface; + // Combine APN, user name, and password as the key of byAPN{} to get + // the corresponding APN setting. + let apnKey = inputApnSetting.apn + (inputApnSetting.user || '') + + (inputApnSetting.password || ''); + if (!this.apnSettings.byAPN[apnKey]) { + this.apnSettings.byAPN[apnKey] = {}; + this.apnSettings.byAPN[apnKey] = inputApnSetting; + this.apnSettings.byAPN[apnKey].iface = + new RILNetworkInterface(this, this.apnSettings.byAPN[apnKey]); + } else { + this.apnSettings.byAPN[apnKey].types.push(inputApnSetting.types); } - this.apnSettings.byAPN = {}; - this.apnSettings.byType = {}; - - // Create new APN settings. - for (let apnIndex = 0; thisSimApnSettings[apnIndex]; apnIndex++) { - let inputApnSetting = thisSimApnSettings[apnIndex]; - if (!this.validateApnSetting(inputApnSetting)) { - continue; - } - - // Combine APN, user name, and password as the key of byAPN{} to get - // the corresponding APN setting. - let apnKey = inputApnSetting.apn + (inputApnSetting.user || '') + - (inputApnSetting.password || ''); - if (!this.apnSettings.byAPN[apnKey]) { - this.apnSettings.byAPN[apnKey] = {}; - this.apnSettings.byAPN[apnKey] = inputApnSetting; - this.apnSettings.byAPN[apnKey].iface = - new RILNetworkInterface(this, this.apnSettings.byAPN[apnKey]); - } else { - this.apnSettings.byAPN[apnKey].types.push(inputApnSetting.types); - } - for each (let type in inputApnSetting.types) { - this.apnSettings.byType[type] = {}; - this.apnSettings.byType[type] = this.apnSettings.byAPN[apnKey]; - } + for each (let type in inputApnSetting.types) { + this.apnSettings.byType[type] = {}; + this.apnSettings.byType[type] = this.apnSettings.byAPN[apnKey]; } } }, @@ -2322,8 +2318,15 @@ RadioInterface.prototype = { break; case "ril.data.enabled": if (DEBUG) this.debug("'ril.data.enabled' is now " + aResult); + let enabled; + if (Array.isArray(aResult)) { + enabled = aResult[this.clientId]; + } else { + // Backward compability + enabled = aResult; + } this.dataCallSettings.oldEnabled = this.dataCallSettings.enabled; - this.dataCallSettings.enabled = aResult; + this.dataCallSettings.enabled = enabled; this.updateRILNetworkInterface(); break; case "ril.data.roaming_enabled":