From f189f30984f3961d62fc114e457fdea3c55c4582 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 04:15:52 -0700 Subject: [PATCH 01/15] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3382d021b373 Author: Alive.Kuo Desc: Merge pull request #24315 from alivedise/bugzilla/1069236/broken-attention-notification Bug 1069236 - fix attention notification style, r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/19592949b7c3 Author: Alive Kuo Desc: Bug 1069236 - fix attention notification style --- 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 18710fadb23..f5d78d7cb15 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "6890cdf5807b0c9a4341b97ee39fd692dc95fd0c", + "revision": "3382d021b373d858c811ef9392d18c10c9ee0a39", "repo_path": "/integration/gaia-central" } From 37e23d0d86f4011c27bf4035d92cebb03bfb690d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 04:22:11 -0700 Subject: [PATCH 02/15] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 7dd17385138..0af54e380ac 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9d4343f91a8..27a4b6e6f14 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 33a33af74c9..695cbaa8448 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 220bb364f59..46428df5dc7 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 9d4343f91a8..27a4b6e6f14 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 792ed776c73..89d3aba345a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 323fc0afc7e..3db46426e6b 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 6de33ad5ce1..8e233e0749e 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 86ada059161..62b69ac730a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 2dbda599c69..cb38c6a75a8 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1dcb5ebd643..6090d6abe86 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 580fc128d51f5d564ef3171209e76a78d06207fa Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 04:35:47 -0700 Subject: [PATCH 03/15] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/974156f7adae Author: Ben Francis Desc: Merge pull request #24318 from begeeben/1011669_double_tapping_on_plus_sign_master Bug 1011669 - [B2G][Browser]Double-tapping on plus sign (New Tab) presen...r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/fb9fe37a7c4e Author: Yi-Fan Liao Desc: Bug 1011669 - [B2G][Browser]Double-tapping on plus sign (New Tab) presents more New Tabs than what shows when returning to New Tab screen * Only respond to new tab clicks if not in transition and the current screen is TABS_Screen to prevent multiple empty tabs from created ======== https://hg.mozilla.org/integration/gaia-central/rev/201d987b02b5 Author: Jose M. Cantera Desc: Merge pull request #24224 from jmcanterafonseca/ice_settings_refactors Bug 1068651 - [Contacts] [ICE] In occasions the ICE Group and Contact Settings info is not correctly updated ======== https://hg.mozilla.org/integration/gaia-central/rev/73c2ea838529 Author: Jose M. Cantera Desc: Bug 1068651 - [Contacts] [ICE] In occasions the ICE Group and Contact Settings info is not correctly updated --- 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 f5d78d7cb15..bcff92df806 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3382d021b373d858c811ef9392d18c10c9ee0a39", + "revision": "974156f7adae5c07ca176d4cd999046f9a9cae45", "repo_path": "/integration/gaia-central" } From 3e68787d758bfd103e92fccdc1873d236cbdd44a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 04:41:57 -0700 Subject: [PATCH 04/15] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0af54e380ac..33c9e33db22 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 27a4b6e6f14..36894f383bf 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 695cbaa8448..bded3465549 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 46428df5dc7..61983083afe 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 27a4b6e6f14..36894f383bf 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 89d3aba345a..2251d5d9ada 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 3db46426e6b..f471ee5e026 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8e233e0749e..3c4224e46b2 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 62b69ac730a..1e025843ccd 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index cb38c6a75a8..60ea7b2a9bd 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 6090d6abe86..7290938a7b7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 1618fe8ed276c5fe5a78a851d7791cea150da8fa Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 05:05:52 -0700 Subject: [PATCH 05/15] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/dd00710172ed Author: gitmai Desc: Merge pull request #24221 from gitmai/bug-1067297-WAPPUSH-warning-prompt Bug 1067297 - [WAP Push] Implement Warning Prompt when a WAP Push messag... ======== https://hg.mozilla.org/integration/gaia-central/rev/128091628cc2 Author: mai Desc: Bug 1067297 - [WAP Push] Implement Warning Prompt when a WAP Push message containing APN settings is received --- 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 bcff92df806..5460b124bba 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "974156f7adae5c07ca176d4cd999046f9a9cae45", + "revision": "dd00710172edcfe5c0256098ff389e229dc9bc8c", "repo_path": "/integration/gaia-central" } From 20ef6a4ad2d17c6d33588a510fb6ac2475b883e0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 05:12:01 -0700 Subject: [PATCH 06/15] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 33c9e33db22..b092dc280e9 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 36894f383bf..05961f273a0 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index bded3465549..8cf0b8a491d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 61983083afe..19b6336d0f6 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 36894f383bf..05961f273a0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 2251d5d9ada..0a81807b95d 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f471ee5e026..92a6ec06a04 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 3c4224e46b2..2b0e46ed1f8 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 1e025843ccd..e1ad9b92e0c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 60ea7b2a9bd..d4d736b095d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 7290938a7b7..08722ba7980 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3af1bde0637fa4bbf632e9814b9aa251677089f1 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 23 Sep 2014 08:32:06 -0400 Subject: [PATCH 07/15] No bug - Clean up webapi test manifest. --- .../client/marionette/tests/webapi-tests.ini | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testing/marionette/client/marionette/tests/webapi-tests.ini b/testing/marionette/client/marionette/tests/webapi-tests.ini index 70fd49d2e19..eaf25dae9b0 100644 --- a/testing/marionette/client/marionette/tests/webapi-tests.ini +++ b/testing/marionette/client/marionette/tests/webapi-tests.ini @@ -12,17 +12,17 @@ b2g = true skip = false ; webapi tests -[include:../../../../../dom/bluetooth/tests/marionette/manifest.ini] -[include:../../../../../dom/telephony/test/marionette/manifest.ini] -[include:../../../../../dom/voicemail/test/marionette/manifest.ini] [include:../../../../../dom/battery/test/marionette/manifest.ini] -[include:../../../../../dom/mobilemessage/tests/marionette/manifest.ini] -[include:../../../../../dom/mobileconnection/tests/marionette/manifest.ini] -[include:../../../../../dom/system/gonk/tests/marionette/manifest.ini] -[include:../../../../../dom/icc/tests/marionette/manifest.ini] -[include:../../../../../dom/system/tests/marionette/manifest.ini] -[include:../../../../../dom/nfc/tests/marionette/manifest.ini] -[include:../../../../../dom/events/test/marionette/manifest.ini] -[include:../../../../../dom/wifi/test/marionette/manifest.ini] +[include:../../../../../dom/bluetooth/tests/marionette/manifest.ini] [include:../../../../../dom/cellbroadcast/tests/marionette/manifest.ini] -[include:../../../../../dom/tethering/tests/marionette/manifest.ini] \ No newline at end of file +[include:../../../../../dom/events/test/marionette/manifest.ini] +[include:../../../../../dom/icc/tests/marionette/manifest.ini] +[include:../../../../../dom/mobileconnection/tests/marionette/manifest.ini] +[include:../../../../../dom/mobilemessage/tests/marionette/manifest.ini] +[include:../../../../../dom/nfc/tests/marionette/manifest.ini] +[include:../../../../../dom/system/gonk/tests/marionette/manifest.ini] +[include:../../../../../dom/system/tests/marionette/manifest.ini] +[include:../../../../../dom/telephony/test/marionette/manifest.ini] +[include:../../../../../dom/tethering/tests/marionette/manifest.ini] +[include:../../../../../dom/voicemail/test/marionette/manifest.ini] +[include:../../../../../dom/wifi/test/marionette/manifest.ini] From a85099277b9d8d0e6d89453d9ceeb79762ed2d3f Mon Sep 17 00:00:00 2001 From: Morris Tseng Date: Tue, 23 Sep 2014 00:10:00 -0400 Subject: [PATCH 08/15] Bug 1051995 - Use observer services to prevent ContentParent leak. r=fabrice --- b2g/chrome/content/shell.js | 3 ++- dom/browser-element/BrowserElementParent.jsm | 22 ++++--------------- .../mochitest/browserElement_CopyPaste.js | 7 +++--- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js index e01eb1aa568..bd50d3ee593 100644 --- a/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -738,7 +738,8 @@ let DoCommandHelper = { handleEvent: function docommand_handleEvent(cmd) { if (this._event) { - shell.sendEvent(this._event.target, 'mozdocommand', { cmd: cmd }); + Services.obs.notifyObservers({ wrappedJSObject: this._event.target }, + 'copypaste-docommand', cmd); this._event = null; } } diff --git a/dom/browser-element/BrowserElementParent.jsm b/dom/browser-element/BrowserElementParent.jsm index 650a7c52999..58ef94bb9a7 100644 --- a/dom/browser-element/BrowserElementParent.jsm +++ b/dom/browser-element/BrowserElementParent.jsm @@ -85,6 +85,7 @@ function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) { Services.obs.addObserver(this, 'ask-children-to-exit-fullscreen', /* ownsWeak = */ true); Services.obs.addObserver(this, 'oop-frameloader-crashed', /* ownsWeak = */ true); + Services.obs.addObserver(this, 'copypaste-docommand', /* ownsWeak = */ true); let defineMethod = function(name, fn) { XPCNativeWrapper.unwrap(self._frameElement)[name] = function() { @@ -169,14 +170,6 @@ function BrowserElementParent(frameLoader, hasRemoteFrame, isPendingFrame) { /* wantsUntrusted = */ false); } - this._doCommandHandlerBinder = this._doCommandHandler.bind(this); - this._frameElement.addEventListener('mozdocommand', - this._doCommandHandlerBinder, - /* useCapture = */ false, - /* wantsUntrusted = */ false); - - Services.obs.addObserver(this, 'ipc:browser-destroyed', /* ownsWeak = */ true); - this._window._browserElementParents.set(this, null); // Insert ourself into the prompt service. @@ -498,11 +491,6 @@ BrowserElementParent.prototype = { this._frameElement.dispatchEvent(evt); }, - _doCommandHandler: function(e) { - e.stopPropagation(); - this._sendAsyncMsg('do-command', { command: e.detail.cmd }); - }, - _createEvent: function(evtName, detail, cancelable) { // This will have to change if we ever want to send a CustomEvent with null // detail. For now, it's OK. @@ -926,11 +914,9 @@ BrowserElementParent.prototype = { } Services.obs.removeObserver(this, 'remote-browser-frame-shown'); } - case 'ipc:browser-destroyed': - if (this._isAlive() && subject == this._frameLoader) { - Services.obs.removeObserver(this, 'ipc:browser-destroyed'); - this._frameElement.removeEventListener('mozdocommand', - this._doCommandHandlerBinder) + case 'copypaste-docommand': + if (this._isAlive() && this._frameElement.isEqualNode(subject.wrappedJSObject)) { + this._sendAsyncMsg('do-command', { command: data }); } break; default: diff --git a/dom/browser-element/mochitest/browserElement_CopyPaste.js b/dom/browser-element/mochitest/browserElement_CopyPaste.js index 47e010f8e11..2030f705fe0 100644 --- a/dom/browser-element/mochitest/browserElement_CopyPaste.js +++ b/dom/browser-element/mochitest/browserElement_CopyPaste.js @@ -8,6 +8,7 @@ SimpleTest.waitForExplicitFinish(); browserElementTestHelpers.setEnabledPref(true); browserElementTestHelpers.setSelectionChangeEnabledPref(true); browserElementTestHelpers.addPermission(); +const { Services } = SpecialPowers.Cu.import('resource://gre/modules/Services.jsm'); var gTextarea = null; var mm; var iframe; @@ -60,10 +61,8 @@ function runTest() { } function doCommand(cmd) { - let doc = iframe.ownerDocument; - let event = doc.createEvent('CustomEvent'); - event.initCustomEvent('mozdocommand', true, true, { cmd: cmd }); - SpecialPowers.wrap(iframe).dispatchEvent(event); + Services.obs.notifyObservers({wrappedJSObject: iframe}, + 'copypaste-docommand', cmd); } function dispatchTest(e) { From 3d22a4d5c96a7da8752b5ceaef28f67ed1c2206c Mon Sep 17 00:00:00 2001 From: Henry Chang Date: Thu, 18 Sep 2014 17:08:05 +0200 Subject: [PATCH 09/15] Bug 1065916 - Make usb/wifi tethering request exclusively executed. r=chucklee --- dom/system/gonk/NetworkManager.js | 79 +++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 19 deletions(-) diff --git a/dom/system/gonk/NetworkManager.js b/dom/system/gonk/NetworkManager.js index 905c4decdc4..f56bf99e827 100644 --- a/dom/system/gonk/NetworkManager.js +++ b/dom/system/gonk/NetworkManager.js @@ -741,7 +741,7 @@ NetworkManager.prototype = { #endif }, - _requestCount: 0, + _usbTetheringRequestCount: 0, handle: function(aName, aResult) { switch(aName) { @@ -776,12 +776,17 @@ NetworkManager.prototype = { if (this._oldUsbTetheringEnabledState === this.tetheringSettings[SETTINGS_USB_ENABLED]) { debug("No changes for SETTINGS_USB_ENABLED flag. Nothing to do."); + this.handlePendingWifiTetheringRequest(); break; } - this._requestCount++; - if (this._requestCount === 1) { - this.handleUSBTetheringToggle(aResult); + this._usbTetheringRequestCount++; + if (this._usbTetheringRequestCount === 1) { + if (this._wifiTetheringRequestOngoing) { + debug('USB tethering request is blocked by ongoing wifi tethering request.'); + } else { + this.handleLastUsbTetheringRequest(); + } } break; }; @@ -819,24 +824,31 @@ NetworkManager.prototype = { // External and internal interface name. _tetheringInterface: null, - handleLastRequest: function() { - if (this._requestCount === 1) { - this._requestCount = 0; + handleLastUsbTetheringRequest: function() { + debug('handleLastUsbTetheringRequest... ' + this._usbTetheringRequestCount); + + if (this._usbTetheringRequestCount === 0) { if (this.wantConnectionEvent) { if (this.tetheringSettings[SETTINGS_USB_ENABLED]) { this.wantConnectionEvent.call(this); } this.wantConnectionEvent = null; } + this.handlePendingWifiTetheringRequest(); return; } - if (this._requestCount > 1) { - // Set this._requestCount to 1 to prevent from subsequent usb tethering toggles - // triggering |handleUSBTetheringToggle|. - this._requestCount = 1; - this.handleUSBTetheringToggle(this.tetheringSettings[SETTINGS_USB_ENABLED]); - this.wantConnectionEvent = null; + // Cancel the accumlated count to 1 since we only care about the + // last state. + this._usbTetheringRequestCount = 1; + this.handleUSBTetheringToggle(this.tetheringSettings[SETTINGS_USB_ENABLED]); + this.wantConnectionEvent = null; + }, + + handlePendingWifiTetheringRequest: function() { + if (this._pendingWifiTetheringRequestArgs) { + this.setWifiTethering.apply(this, this._pendingWifiTetheringRequestArgs); + this._pendingWifiTetheringRequestArgs = null; } }, @@ -932,14 +944,16 @@ NetworkManager.prototype = { (this._usbTetheringAction === TETHERING_STATE_ONGOING || this._usbTetheringAction === TETHERING_STATE_ACTIVE)) { debug("Usb tethering already connecting/connected."); - this._requestCount = 0; + this._usbTetheringRequestCount = 0; + this.handlePendingWifiTetheringRequest(); return; } if (!enable && this._usbTetheringAction === TETHERING_STATE_IDLE) { debug("Usb tethering already disconnected."); - this._requestCount = 0; + this._usbTetheringRequestCount = 0; + this.handlePendingWifiTetheringRequest(); return; } @@ -1034,16 +1048,21 @@ NetworkManager.prototype = { debug("setWifiTethering: " + (msg ? msg : "success")); if (callback) { - callback.wifiTetheringEnabledChange(msg); + // Callback asynchronously to avoid netsted toggling. + Services.tm.currentThread.dispatch(() => { + callback.wifiTetheringEnabledChange(msg); + }, Ci.nsIThread.DISPATCH_NORMAL); } }, + _wifiTetheringRequestOngoing: false, enableWifiTethering: function(enable, config, callback) { // Fill in config's required fields. config.ifname = this._tetheringInterface[TETHERING_TYPE_WIFI].internalInterface; config.internalIfname = this._tetheringInterface[TETHERING_TYPE_WIFI].internalInterface; config.externalIfname = this._tetheringInterface[TETHERING_TYPE_WIFI].externalInterface; + this._wifiTetheringRequestOngoing = true; gNetworkService.setWifiTethering(enable, config, (function(error) { #ifdef MOZ_B2G_RIL // Disconnect dun on error or when wifi tethering is disabled. @@ -1053,10 +1072,17 @@ NetworkManager.prototype = { } #endif let resetSettings = error; + debug('gNetworkService.setWifiTethering finished'); this.notifyError(resetSettings, callback, error); + this._wifiTetheringRequestOngoing = false; + if (this._usbTetheringRequestCount > 0) { + debug('Perform pending USB tethering requests.'); + this.handleLastUsbTetheringRequest(); + } }).bind(this)); }, + _pendingWifiTetheringRequestArgs: null, // Enable/disable WiFi tethering by sending commands to netd. setWifiTethering: function(enable, network, config, callback) { debug("setWifiTethering: " + enable); @@ -1070,6 +1096,16 @@ NetworkManager.prototype = { return; } + if (this._usbTetheringRequestCount > 0) { + // If there's still pending usb tethering request, save + // the request params and redo |setWifiTethering| on + // usb tethering task complete. + debug('USB tethering request is being processed. Queue this wifi tethering request.'); + this._pendingWifiTetheringRequestArgs = Array.prototype.slice.call(arguments); + debug('Pending args: ' + JSON.stringify(this._pendingWifiTetheringRequestArgs)); + return; + } + if (!enable) { this.enableWifiTethering(false, config, callback); return; @@ -1143,20 +1179,24 @@ NetworkManager.prototype = { this._tetheringInterface[TETHERING_TYPE_USB], this.usbTetheringResultReport.bind(this, enable)); } else { - this.usbTetheringResultReport("Failed to set usb function"); + this.usbTetheringResultReport(enable, "enableUsbRndisResult failure"); throw new Error("failed to set USB Function to adb"); } }, usbTetheringResultReport: function(enable, error) { + this._usbTetheringRequestCount--; + let settingsLock = gSettingsService.createLock(); + debug('usbTetheringResultReport callback. enable: ' + enable + ', error: ' + error); + // Disable tethering settings when fail to enable it. if (error) { this.tetheringSettings[SETTINGS_USB_ENABLED] = false; settingsLock.set("tethering.usb.enabled", false, null); // Skip others request when we found an error. - this._requestCount = 0; + this._usbTetheringRequestCount = 0; this._usbTetheringAction = TETHERING_STATE_IDLE; #ifdef MOZ_B2G_RIL if (this.tetheringSettings[SETTINGS_DUN_REQUIRED]) { @@ -1174,7 +1214,8 @@ NetworkManager.prototype = { } #endif } - this.handleLastRequest(); + + this.handleLastUsbTetheringRequest(); } }, From 4a90908e7787deacecfaf2b901fe5a7a9bb8e71f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 05:35:49 -0700 Subject: [PATCH 10/15] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cb08dfcbc56f Author: Dale Harvey Desc: Revert "Bug 1063685 - Fix lookup for browser windows. r=alive" This reverts commit a0fa29db8e9e15afe3b1787bf494caa86a033f10. --- 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 5460b124bba..2243be7faaa 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "dd00710172edcfe5c0256098ff389e229dc9bc8c", + "revision": "cb08dfcbc56ff4edc83ef36dcf9e684f4e689b73", "repo_path": "/integration/gaia-central" } From a1e539352fbd5892eb2f25a6b365e43b80f33b85 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 05:42:01 -0700 Subject: [PATCH 11/15] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index b092dc280e9..a767623bdca 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 05961f273a0..b826f008c71 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 8cf0b8a491d..8f088182b2e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 19b6336d0f6..3e5df37b1c1 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 05961f273a0..b826f008c71 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 0a81807b95d..d8418a8b565 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 92a6ec06a04..ead40ec6f78 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 2b0e46ed1f8..cdcef07f001 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index e1ad9b92e0c..589f6d3fd05 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d4d736b095d..91ee36a6db5 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 08722ba7980..1b646b0a8ab 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4b8261936e48641ac20b8a02aacff087111ecf52 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 05:50:47 -0700 Subject: [PATCH 12/15] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/68844e5e97fe Author: Ryan VanderMeulen Desc: Merge pull request #24242 from sv99/1070495 Bug 1070495 - [ringtones] unit test refactoring for new version chai.assert api ======== https://hg.mozilla.org/integration/gaia-central/rev/b4954a35b0cc Author: sv99 Desc: Bug 1070495 - [ringtones] unit test refactoring for new version chai.assert api ======== https://hg.mozilla.org/integration/gaia-central/rev/d1493f1ff75e Author: Ryan VanderMeulen Desc: Merge pull request #24211 from tauzen/Bug1069188_sesssion_token_removal Bug 1069188 - [NFC] NfcManager not passing sessionToken to activities, r=gweng ======== https://hg.mozilla.org/integration/gaia-central/rev/f0a4de8ad544 Author: Krzysztof Mioduszewski Desc: Bug 1069188 - [NFC] NfcManager not passing sessionToken to activities, r=gweng ======== https://hg.mozilla.org/integration/gaia-central/rev/458e9fed1044 Author: Ryan VanderMeulen Desc: Merge pull request #24150 from ddrmanxbxfr/bug_1062806 Bug 1062806 - Use the new shared helper for loading JSON files in the co.. ======== https://hg.mozilla.org/integration/gaia-central/rev/d511ac0ae852 Author: Mathieu Rhéaume Desc: Bug 1062806 - Use the new shared helper for loading JSON files in the cost control app --- 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 2243be7faaa..99a3843d58d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "cb08dfcbc56ff4edc83ef36dcf9e684f4e689b73", + "revision": "68844e5e97fe4f8b0ce6ffe41b4faa840629db15", "repo_path": "/integration/gaia-central" } From 96d8527829cac90a2617664c1e1f3fc50354d310 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 05:56:57 -0700 Subject: [PATCH 13/15] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a767623bdca..d836688c6f3 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b826f008c71..b0e62edf821 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 8f088182b2e..1f8fed4376a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 3e5df37b1c1..15b264340f6 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b826f008c71..b0e62edf821 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index d8418a8b565..923fd87dc5a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index ead40ec6f78..595e4ac3bd6 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index cdcef07f001..2259c1f1204 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 589f6d3fd05..e98d9aa9f00 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 91ee36a6db5..f5b3c7582ae 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1b646b0a8ab..712777950b4 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 133ae5ba8cb0692ec07012099d71f8c5c130679e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 06:35:48 -0700 Subject: [PATCH 14/15] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9ec69eadd70e Author: Etienne Segonzac Desc: Merge pull request #24226 from etiennesegonzac/bug-1069997 Bug 1069997 - Implement the progress to spec for the updates notifications and prevent a constant restlye r=21 ======== https://hg.mozilla.org/integration/gaia-central/rev/245af397a06a Author: Etienne Segonzac Desc: Bug 1069997 - Implement the progress to spec for the updates notifications and prevent a constant restyle. ======== https://hg.mozilla.org/integration/gaia-central/rev/384537c98019 Author: Jose M. Cantera Desc: Merge pull request #24288 from jmcanterafonseca/sim_import_label Bug 1070914 - [Contacts] [Settings] SIM Import label has disappeared ======== https://hg.mozilla.org/integration/gaia-central/rev/8b6ebfa367ac Author: Jose M. Cantera Desc: Bug 1070914 - [Contacts] [Settings] SIM Import label has disappeared --- 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 99a3843d58d..060c3cbb695 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "68844e5e97fe4f8b0ce6ffe41b4faa840629db15", + "revision": "9ec69eadd70e09ea7afff13e88c1b33d631377bd", "repo_path": "/integration/gaia-central" } From f471a07eda7a3bbee1cbe1b5f984e6b88c6268b2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Sep 2014 06:42:00 -0700 Subject: [PATCH 15/15] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d836688c6f3..c50ef0cf753 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b0e62edf821..331457656c0 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1f8fed4376a..81fb5ced87b 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 15b264340f6..ca02fc46c58 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b0e62edf821..331457656c0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 923fd87dc5a..4c8a91e705f 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 595e4ac3bd6..2c3dccd02d9 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 2259c1f1204..5123e2ab82a 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index e98d9aa9f00..0f0cb41411b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f5b3c7582ae..5c83393dfdb 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 712777950b4..73c9674f796 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +