From e1d1482fa5b795a2877fad6ef82ecb76463fc912 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 01:47:00 -0800 Subject: [PATCH 01/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e1fc4ccd41f9 Author: RickyChien Desc: Merge pull request #26470 from RickyChien/bug-1101942 Bug 1101942 - add search path found in nightly ftp package r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/814e0cef09af Author: Ricky Chien Desc: Bug 1101942 - add search path found in nightly ftp package --- 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 326f3c0c742..15f0b4c498d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "769491b138582de92f5636413928de13268e1a63", + "revision": "e1fc4ccd41f96f10c18780af009405c66ad5eb55", "repo_path": "integration/gaia-central" } From e1fd8454c99e721fc1e008114bcfe776a58a2a1a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 01:51:34 -0800 Subject: [PATCH 02/44] 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 5ec71dbee8d..8cdb02ed327 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 9bb555dff0f..923b2c34c7d 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 7a322faf010..ecd362b3d61 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 ef8a12d8ffc..22f60553c45 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 9bb555dff0f..923b2c34c7d 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 2f7b970251c..e65c6f8f0b7 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 a65bd7b1011..538842545bb 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 b113268a20a..dead540b404 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 e7f05146128..68261569d36 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 093bebf9940..c894bfa8336 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 12ecd390d69..e810f91bb55 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c398403d3a591b785bb3df23ecfcf48f11067596 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 02:01:57 -0800 Subject: [PATCH 03/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c134a25271dd Author: Rex KM Lee Desc: Merge pull request #26399 from rexboy7/1060250-DLNA-player Bug 1060250 - [Stingray][DLNA-player] Initial commit. r=evelyn f=sc ======== https://hg.mozilla.org/integration/gaia-central/rev/a1bd50ad1ea6 Author: Rex Lee Desc: Bug 1060250 - [Stingray][DLNA-player] Initial commit. This version implements: - Detecting dlna services around - ContentDirectory client - AVTransport client - ConnectionService client - Easy UI for local playing files - ssdp.js library - plug.play.js library --- 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 15f0b4c498d..599fc466a40 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e1fc4ccd41f96f10c18780af009405c66ad5eb55", + "revision": "c134a25271dd5fb604a1957d19cdbf51cdb9312d", "repo_path": "integration/gaia-central" } From c4ef7745aa372ec894ec2189008415663e437e98 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 02:07:01 -0800 Subject: [PATCH 04/44] 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 8cdb02ed327..0b3080193f9 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 923b2c34c7d..78b958e94a9 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 ecd362b3d61..27bed82e741 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 22f60553c45..2450f658e97 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 923b2c34c7d..78b958e94a9 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 e65c6f8f0b7..e7a9c071f65 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 538842545bb..9b231f4143c 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 dead540b404..57be3d5e288 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 68261569d36..db9877de914 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 c894bfa8336..4eebd6b2669 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 e810f91bb55..54bf10e8af2 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From a12dac548b32b9c8bcfb4f5e45150d7b2d625971 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 02:17:01 -0800 Subject: [PATCH 05/44] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e02a9641ec6d Author: Yoshi Huang Desc: Merge pull request #26404 from allstarschh/Bug1103730 Bug 1103730 - use peer in nfc-manager-tech-discovered. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/8f1c62bfda34 Author: Yoshi Huang Desc: Bug 1103730 - use peer in nfc-manager-tech-discovered. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/c43a5bd74c1d Author: Yoshi Huang Desc: Merge pull request #26403 from allstarschh/Bug1103729 Bug 1103729 - use peer in nfc-manager-send-file. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/ec16b8ca6ff0 Author: Yoshi Huang Desc: Bug 1103729 - use peer in nfc-manager-send-file. r=alive --- 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 599fc466a40..c85706809d5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "c134a25271dd5fb604a1957d19cdbf51cdb9312d", + "revision": "e02a9641ec6db339f592359be0e8974db2e9b7a0", "repo_path": "integration/gaia-central" } From 45c4416712656038875aa5dc7e355f57d6e4c350 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 02:21:35 -0800 Subject: [PATCH 06/44] 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 0b3080193f9..c32dad5f041 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 78b958e94a9..90711dc619e 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 27bed82e741..0d5b315ef6b 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 2450f658e97..dcb18068b10 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 78b958e94a9..90711dc619e 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 e7a9c071f65..d9a830389b4 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 9b231f4143c..d0cd18bd3f7 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 57be3d5e288..257cae118e9 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 db9877de914..261a8f6e18a 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 4eebd6b2669..bb19e8cb1db 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 54bf10e8af2..b2959b81060 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 836ce05bf8bd2df9f236ca01636028b6a49293ef Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Tue, 28 Oct 2014 15:23:44 +0800 Subject: [PATCH 07/44] Bug 1084233 - Part 1: Introduce head.js and rewrite test_icc_card_lock.js with Promise. r=hsinyi --HG-- rename : dom/icc/tests/marionette/test_icc_card_lock.js => dom/icc/tests/marionette/test_icc_card_lock_change_pin.js --- dom/icc/tests/marionette/head.js | 194 ++++++++++++++++++ dom/icc/tests/marionette/manifest.ini | 3 +- .../tests/marionette/test_icc_card_lock.js | 126 ------------ .../test_icc_card_lock_change_pin.js | 45 ++++ .../test_icc_card_lock_get_retry_count.js | 41 ++++ 5 files changed, 282 insertions(+), 127 deletions(-) create mode 100644 dom/icc/tests/marionette/head.js delete mode 100644 dom/icc/tests/marionette/test_icc_card_lock.js create mode 100644 dom/icc/tests/marionette/test_icc_card_lock_change_pin.js create mode 100644 dom/icc/tests/marionette/test_icc_card_lock_get_retry_count.js diff --git a/dom/icc/tests/marionette/head.js b/dom/icc/tests/marionette/head.js new file mode 100644 index 00000000000..53e9a02d5f3 --- /dev/null +++ b/dom/icc/tests/marionette/head.js @@ -0,0 +1,194 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +const {Cc: Cc, Ci: Ci, Cr: Cr, Cu: Cu} = SpecialPowers; + +const PREF_KEY_RIL_DEBUGGING_ENABLED = "ril.debugging.enabled"; + +// The pin code hard coded in emulator is "0000". +const DEFAULT_PIN = "0000"; + +// Emulate Promise.jsm semantics. +Promise.defer = function() { return new Deferred(); } +function Deferred() { + this.promise = new Promise(function(resolve, reject) { + this.resolve = resolve; + this.reject = reject; + }.bind(this)); + Object.freeze(this); +} + +let _pendingEmulatorCmdCount = 0; + +/** + * Send emulator command with safe guard. + * + * We should only call |finish()| after all emulator command transactions + * end, so here comes with the pending counter. Resolve when the emulator + * gives positive response, and reject otherwise. + * + * Fulfill params: + * result -- an array of emulator response lines. + * Reject params: + * result -- an array of emulator response lines. + * + * @param aCommand + * A string command to be passed to emulator through its telnet console. + * + * @return A deferred promise. + */ +function runEmulatorCmdSafe(aCommand) { + let deferred = Promise.defer(); + + ++_pendingEmulatorCmdCount; + runEmulatorCmd(aCommand, function(aResult) { + --_pendingEmulatorCmdCount; + + ok(true, "Emulator response: " + JSON.stringify(aResult)); + if (Array.isArray(aResult) && + aResult[aResult.length - 1] === "OK") { + deferred.resolve(aResult); + } else { + deferred.reject(aResult); + } + }); + + return deferred.promise; +} + +let workingFrame; +let iccManager; + +/** + * Push required permissions and test if + * |navigator.mozIccManager| exists. Resolve if it does, + * reject otherwise. + * + * Fulfill params: + * iccManager -- an reference to navigator.mozIccManager. + * + * Reject params: (none) + * + * @param aAdditonalPermissions [optional] + * An array of permission strings other than "mobileconnection" to be + * pushed. Default: empty string. + * + * @return A deferred promise. + */ +function ensureIccManager(aAdditionalPermissions) { + let deferred = Promise.defer(); + + aAdditionalPermissions = aAdditionalPermissions || []; + + if (aAdditionalPermissions.indexOf("mobileconnection") < 0) { + aAdditionalPermissions.push("mobileconnection"); + } + let permissions = []; + for (let perm of aAdditionalPermissions) { + permissions.push({ "type": perm, "allow": 1, "context": document }); + } + + SpecialPowers.pushPermissions(permissions, function() { + ok(true, "permissions pushed: " + JSON.stringify(permissions)); + + // Permission changes can't change existing Navigator.prototype + // objects, so grab our objects from a new Navigator. + workingFrame = document.createElement("iframe"); + workingFrame.addEventListener("load", function load() { + workingFrame.removeEventListener("load", load); + + iccManager = workingFrame.contentWindow.navigator.mozIccManager; + + if (iccManager) { + ok(true, "navigator.mozIccManager is instance of " + iccManager.constructor); + } else { + ok(true, "navigator.mozIccManager is undefined"); + } + + if (iccManager instanceof MozIccManager) { + deferred.resolve(iccManager); + } else { + deferred.reject(); + } + }); + + document.body.appendChild(workingFrame); + }); + + return deferred.promise; +} + +/** + * Get MozIcc by IccId + * + * @param aIccId [optional] + * Default: The first item of |aIccManager.iccIds|. + * + * @return A MozIcc. + */ +function getMozIcc(aIccId) { + aIccId = aIccId || iccManager.iccIds[0]; + + if (!aIccId) { + ok(true, "iccManager.iccIds[0] is undefined"); + return null; + } + + return iccManager.getIccById(aIccId); +} + +/** + * Wait for pending emulator transactions and call |finish()|. + */ +function cleanUp() { + // Use ok here so that we have at least one test run. + ok(true, ":: CLEANING UP ::"); + + waitFor(finish, function() { + return _pendingEmulatorCmdCount === 0; + }); +} + +/** + * Basic test routine helper for icc tests. + * + * This helper does nothing but clean-ups. + * + * @param aTestCaseMain + * A function that takes no parameter. + */ +function startTestBase(aTestCaseMain) { + // Turn on debugging pref. + let debugPref = SpecialPowers.getBoolPref(PREF_KEY_RIL_DEBUGGING_ENABLED); + SpecialPowers.setBoolPref(PREF_KEY_RIL_DEBUGGING_ENABLED, true); + + Promise.resolve() + .then(aTestCaseMain) + .catch((aError) => { + ok(false, "promise rejects during test: " + aError); + }) + .then(() => { + // Restore debugging pref. + SpecialPowers.setBoolPref(PREF_KEY_RIL_DEBUGGING_ENABLED, debugPref); + cleanUp(); + }); +} + +/** + * Common test routine helper for icc tests. + * + * This function ensures global variable |iccManager| and |icc| is available + * during the process and performs clean-ups as well. + * + * @param aTestCaseMain + * A function that takes one parameter -- icc. + * @param aAdditonalPermissions [optional] + * An array of permission strings other than "mobileconnection" to be + * pushed. Default: empty string.. + */ +function startTestCommon(aTestCaseMain, aAdditionalPermissions) { + startTestBase(function() { + return ensureIccManager(aAdditionalPermissions) + .then(aTestCaseMain); + }); +} diff --git a/dom/icc/tests/marionette/manifest.ini b/dom/icc/tests/marionette/manifest.ini index fd31815dd4a..526564464a6 100644 --- a/dom/icc/tests/marionette/manifest.ini +++ b/dom/icc/tests/marionette/manifest.ini @@ -5,7 +5,8 @@ qemu = true [test_stk_proactive_command.js] [test_icc_contact.js] -[test_icc_card_lock.js] +[test_icc_card_lock_get_retry_count.js] +[test_icc_card_lock_change_pin.js] [test_icc_card_state.js] [test_icc_info.js] [test_stk_refresh.js] diff --git a/dom/icc/tests/marionette/test_icc_card_lock.js b/dom/icc/tests/marionette/test_icc_card_lock.js deleted file mode 100644 index 0c16e381b2e..00000000000 --- a/dom/icc/tests/marionette/test_icc_card_lock.js +++ /dev/null @@ -1,126 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -MARIONETTE_TIMEOUT = 30000; -MARIONETTE_HEAD_JS = "icc_header.js"; - -/* Test PIN code changes fail */ -taskHelper.push(function testPinChangeFailed() { - // The default pin is '0000' in emulator - let request = icc.setCardLock( - {lockType: "pin", - pin: "1111", - newPin: "0000"}); - - ok(request instanceof DOMRequest, - "request instanceof " + request.constructor); - - request.onerror = function onerror() { - is(request.error.name, "IncorrectPassword"); - // The default pin retries is 3, failed once becomes to 2 - is(request.error.retryCount, 2); - - // Reset pin retries by passing correct pin code. - let resetRequest = icc.setCardLock( - {lockType: "pin", - pin: "0000", - newPin: "0000"}); - - resetRequest.onsuccess = function onsuccess() { - taskHelper.runNext(); - }; - - resetRequest.onerror = function onerror() { - ok(false, "Reset pin retries got error: " + request.error.name); - taskHelper.runNext(); - }; - }; -}); - -/* Test PIN code changes success */ -taskHelper.push(function testPinChangeSuccess() { - // The default pin is '0000' in emulator - let request = icc.setCardLock( - {lockType: "pin", - pin: "0000", - newPin: "0000"}); - - ok(request instanceof DOMRequest, - "request instanceof " + request.constructor); - - request.onerror = function onerror() { - ok(false, "Should not fail, got error: " + request.error.name); - - taskHelper.runNext(); - }; - - request.onsuccess = function onsuccess() { - taskHelper.runNext(); - }; -}); - -/* Read PIN-lock retry count */ -taskHelper.push(function testPinCardLockRetryCount() { - let request = icc.getCardLockRetryCount('pin'); - - ok(request instanceof DOMRequest, - 'request instanceof ' + request.constructor); - - request.onsuccess = function onsuccess() { - ok(request.result.retryCount >= 0, - 'retryCount is ' + request.result.retryCount); - taskHelper.runNext(); - }; - request.onerror = function onerror() { - // The operation is optional any might not be supported for all - // all locks. In this case, we generate 'NotSupportedError' for - // the valid lock types. - is(request.error.name, 'RequestNotSupported', - 'error name is ' + request.error.name); - taskHelper.runNext(); - }; -}); - -/* Read PUK-lock retry count */ -taskHelper.push(function testPukCardLockRetryCount() { - let request = icc.getCardLockRetryCount('puk'); - - ok(request instanceof DOMRequest, - 'request instanceof ' + request.constructor); - - request.onsuccess = function onsuccess() { - ok(request.result.retryCount >= 0, - 'retryCount is ' + request.result.retryCount); - taskHelper.runNext(); - }; - request.onerror = function onerror() { - // The operation is optional any might not be supported for all - // all locks. In this case, we generate 'NotSupportedError' for - // the valid lock types. - is(request.error.name, 'RequestNotSupported', - 'error name is ' + request.error.name); - taskHelper.runNext(); - }; -}); - -/* Read lock retry count for an invalid entries */ -taskHelper.push(function testInvalidCardLockRetryCount() { - let request = icc.getCardLockRetryCount('invalid-lock-type'); - - ok(request instanceof DOMRequest, - 'request instanceof ' + request.constructor); - - request.onsuccess = function onsuccess() { - ok(false, - 'request should never return success for an invalid lock type'); - taskHelper.runNext(); - }; - request.onerror = function onerror() { - is(request.error.name, 'GenericFailure', - 'error name is ' + request.error.name); - taskHelper.runNext(); - }; -}); - -// Start test -taskHelper.runNext(); diff --git a/dom/icc/tests/marionette/test_icc_card_lock_change_pin.js b/dom/icc/tests/marionette/test_icc_card_lock_change_pin.js new file mode 100644 index 00000000000..07a8c5a7a4e --- /dev/null +++ b/dom/icc/tests/marionette/test_icc_card_lock_change_pin.js @@ -0,0 +1,45 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; + +const LOCK_TYPE = "pin"; + +function testChangePin(aIcc, aPin, aNewPin, aErrorName, aRetryCount) { + log("testChangePin for pin=" + aPin + " and newPin=" + aNewPin); + return aIcc.setCardLock({ lockType: LOCK_TYPE, pin: aPin, newPin: aNewPin }) + .then((aResult) => { + if (aErrorName) { + ok(false, "changing pin should not success"); + } + }, (aError) => { + if (!aErrorName) { + ok(false, "changing pin should not fail"); + return; + } + + // check the request error. + is(aError.name, aErrorName, "error.name"); + is(aError.retryCount, aRetryCount, "error.retryCount"); + }); +} + +// Start tests +startTestCommon(function() { + let icc = getMozIcc(); + let retryCount; + + return icc.getCardLockRetryCount(LOCK_TYPE) + // Get current PIN-lock retry count. + .then((aResult) => { + retryCount = aResult.retryCount; + ok(true, LOCK_TYPE + " retryCount is " + retryCount); + }) + // Test PIN code changes fail. + // The retry count should be decreased by 1. + .then(() => testChangePin(icc, "1111", DEFAULT_PIN, "IncorrectPassword", + retryCount - 1)) + // Test PIN code changes success. This will reset the retry count. + .then(() => testChangePin(icc, DEFAULT_PIN, DEFAULT_PIN)); +}); diff --git a/dom/icc/tests/marionette/test_icc_card_lock_get_retry_count.js b/dom/icc/tests/marionette/test_icc_card_lock_get_retry_count.js new file mode 100644 index 00000000000..25b9ef7874b --- /dev/null +++ b/dom/icc/tests/marionette/test_icc_card_lock_get_retry_count.js @@ -0,0 +1,41 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; + +function testGetCardLockRetryCount(aIcc, aLockType, aRetryCount) { + log("testGetCardLockRetryCount for " + aLockType); + return aIcc.getCardLockRetryCount(aLockType) + .then((aResult) => { + if (!aRetryCount) { + ok(false, "getCardLockRetryCount(" + aLockType + ") should not success"); + return; + } + + // Check the request result. + is(aResult.retryCount, aRetryCount, "result.retryCount"); + }, (aError) => { + if (aRetryCount) { + ok(false, "getCardLockRetryCount(" + aLockType + ") should not fail"); + return; + } + + // Check the error. + is(aError.name, "GenericFailure", "error.name"); + }); +} + +// Start tests +startTestCommon(function() { + let icc = getMozIcc(); + + // Read PIN-lock retry count. + // The default PIN-lock retry count hard coded in emulator is 3. + return testGetCardLockRetryCount(icc, "pin", 3) + // Read PUK-lock retry count. + // The default PUK-lock retry count hard coded in emulator is 6. + .then(() => testGetCardLockRetryCount(icc, "puk", 6)) + // Read lock retry count for an invalid entries. + .then(() => testGetCardLockRetryCount(icc, "invalid-lock-type")); +}); From 677a48b8aa2b6cc1fc1abfdb3fd02d0764bd4229 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Sun, 26 Oct 2014 15:25:37 +0800 Subject: [PATCH 08/44] Bug 1084233 - Part 2: Add marionette test for enabling/disabling pin lock. r=hsinyi --- dom/icc/tests/marionette/manifest.ini | 1 + .../test_icc_card_lock_enable_pin.js | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 dom/icc/tests/marionette/test_icc_card_lock_enable_pin.js diff --git a/dom/icc/tests/marionette/manifest.ini b/dom/icc/tests/marionette/manifest.ini index 526564464a6..a0acdf2c55d 100644 --- a/dom/icc/tests/marionette/manifest.ini +++ b/dom/icc/tests/marionette/manifest.ini @@ -7,6 +7,7 @@ qemu = true [test_icc_contact.js] [test_icc_card_lock_get_retry_count.js] [test_icc_card_lock_change_pin.js] +[test_icc_card_lock_enable_pin.js] [test_icc_card_state.js] [test_icc_info.js] [test_stk_refresh.js] diff --git a/dom/icc/tests/marionette/test_icc_card_lock_enable_pin.js b/dom/icc/tests/marionette/test_icc_card_lock_enable_pin.js new file mode 100644 index 00000000000..ea21821c0f2 --- /dev/null +++ b/dom/icc/tests/marionette/test_icc_card_lock_enable_pin.js @@ -0,0 +1,59 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; + +function setCardLockAndCheck(aIcc, aLockType, aPin, aEnabled, aErrorName, + aRetryCount) { + let options = { + lockType: aLockType, + enabled: aEnabled, + pin: aPin + }; + + return aIcc.setCardLock(options) + .then((aResult) => { + if (aErrorName) { + ok(false, "setting pin should not success"); + return; + } + + // Check lock state. + return aIcc.getCardLock(aLockType) + .then((aResult) => { + is(aResult.enabled, aEnabled, "result.enabled"); + }); + }, (aError) => { + if (!aErrorName) { + ok(false, "setting pin should not fail"); + return; + } + + // Check the request error. + is(aError.name, aErrorName, "error.name"); + is(aError.retryCount, aRetryCount, "error.retryCount"); + }); +} + +// Start tests +startTestCommon(function() { + let icc = getMozIcc(); + let lockType = "pin"; + let retryCount; + + return icc.getCardLockRetryCount(lockType) + // Get current PIN-lock retry count. + .then((aResult) => { + retryCount = aResult.retryCount; + ok(true, lockType + " retryCount is " + retryCount); + }) + // Test fail to enable PIN-lock by passing wrong pin. + // The retry count should be decreased by 1. + .then(() => setCardLockAndCheck(icc, lockType, "1111", true, + "IncorrectPassword", retryCount -1)) + // Test enabling PIN-lock. + .then(() => setCardLockAndCheck(icc, lockType, DEFAULT_PIN, true)) + // Restore pin state. + .then(() => setCardLockAndCheck(icc, lockType, DEFAULT_PIN, false)); +}); From 1e7360968bae5f9308b95f7b2d0823cedefd8684 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Mon, 27 Oct 2014 11:10:35 +0800 Subject: [PATCH 09/44] Bug 1084233 - Part 3: Add marionette test for unlocking pin. r=hsinyi --- dom/icc/tests/marionette/head.js | 152 ++++++++++++++++++ dom/icc/tests/marionette/manifest.ini | 1 + .../test_icc_card_lock_unlock_pin.js | 68 ++++++++ 3 files changed, 221 insertions(+) create mode 100644 dom/icc/tests/marionette/test_icc_card_lock_unlock_pin.js diff --git a/dom/icc/tests/marionette/head.js b/dom/icc/tests/marionette/head.js index 53e9a02d5f3..c4e2692d1da 100644 --- a/dom/icc/tests/marionette/head.js +++ b/dom/icc/tests/marionette/head.js @@ -137,6 +137,158 @@ function getMozIcc(aIccId) { return iccManager.getIccById(aIccId); } +/** + * Get MozMobileConnection by ServiceId + * + * @param aServiceId [optional] + * A numeric DSDS service id. Default: 0 if not indicated. + * + * @return A MozMobileConnection. + */ +function getMozMobileConnectionByServiceId(aServiceId) { + aServiceId = aServiceId || 0; + return workingFrame.contentWindow.navigator.mozMobileConnections[aServiceId]; +} + +/** + * Set radio enabling state. + * + * Resolve no matter the request succeeds or fails. Never reject. + * + * Fulfill params: (none) + * + * @param aEnabled + * A boolean state. + * @param aServiceId [optional] + * A numeric DSDS service id. + * + * @return A deferred promise. + */ +function setRadioEnabled(aEnabled, aServiceId) { + return getMozMobileConnectionByServiceId(aServiceId).setRadioEnabled(aEnabled) + .then(() => { + ok(true, "setRadioEnabled " + aEnabled + " on " + aServiceId + " success."); + }, (aError) => { + ok(false, "setRadioEnabled " + aEnabled + " on " + aServiceId + " " + + aError.name); + }); +} + +/** + * Wait for one named event. + * + * Resolve if that named event occurs. Never reject. + * + * Fulfill params: the DOMEvent passed. + * + * @param aEventTarget + * An EventTarget object. + * @param aEventName + * A string event name. + * @param aMatchFun [optional] + * A matching function returns true or false to filter the event. + * + * @return A deferred promise. + */ +function waitForTargetEvent(aEventTarget, aEventName, aMatchFun) { + let deferred = Promise.defer(); + + aEventTarget.addEventListener(aEventName, function onevent(aEvent) { + if (!aMatchFun || aMatchFun(aEvent)) { + aEventTarget.removeEventListener(aEventName, onevent); + ok(true, "Event '" + aEventName + "' got."); + deferred.resolve(aEvent); + } + }); + + return deferred.promise; +} + +/** + * Set radio enabling state and wait for "radiostatechange" event. + * + * Resolve if radio state changed to the expected one. Never reject. + * + * Fulfill params: (none) + * + * @param aEnabled + * A boolean state. + * @param aServiceId [optional] + * A numeric DSDS service id. Default: the one indicated in + * start*TestCommon() or 0 if not indicated. + * + * @return A deferred promise. + */ +function setRadioEnabledAndWait(aEnabled, aServiceId) { + let mobileConn = getMozMobileConnectionByServiceId(aServiceId); + let promises = []; + + promises.push(waitForTargetEvent(mobileConn, "radiostatechange", function() { + // To ignore some transient states, we only resolve that deferred promise + // when |radioState| equals to the expected one. + return mobileConn.radioState === (aEnabled ? "enabled" : "disabled"); + })); + promises.push(setRadioEnabled(aEnabled, aServiceId)); + + return Promise.all(promises); +} + +/** + * Restart radio and wait card state changes to expected one. + * + * Resolve if card state changed to the expected one. Never reject. + * + * Fulfill params: (none) + * + * @param aCardState + * Expected card state. + * + * @return A deferred promise. + */ +function restartRadioAndWait(aCardState) { + return setRadioEnabledAndWait(false).then(() => { + let promises = []; + + promises.push(waitForTargetEvent(iccManager, "iccdetected") + .then((aEvent) => { + let icc = getMozIcc(aEvent.iccId); + if (icc.cardState !== aCardState) { + return waitForTargetEvent(icc, "cardstatechange", function() { + return icc.cardState === aCardState; + }); + } + })); + promises.push(setRadioEnabledAndWait(true)); + + return Promise.all(promises); + }); +} + +/** + * Enable/Disable PIN-lock. + * + * Fulfill params: (none) + * Reject params: + * An object contains error name and remaining retry count. + * @see IccCardLockError + * + * @param aIcc + * A MozIcc object. + * @param aEnabled + * A boolean state. + * + * @return A deferred promise. + */ +function setPinLockEnabled(aIcc, aEnabled) { + let options = { + lockType: "pin", + enabled: aEnabled, + pin: DEFAULT_PIN + }; + + return aIcc.setCardLock(options); +} + /** * Wait for pending emulator transactions and call |finish()|. */ diff --git a/dom/icc/tests/marionette/manifest.ini b/dom/icc/tests/marionette/manifest.ini index a0acdf2c55d..251223b6ea6 100644 --- a/dom/icc/tests/marionette/manifest.ini +++ b/dom/icc/tests/marionette/manifest.ini @@ -8,6 +8,7 @@ qemu = true [test_icc_card_lock_get_retry_count.js] [test_icc_card_lock_change_pin.js] [test_icc_card_lock_enable_pin.js] +[test_icc_card_lock_unlock_pin.js] [test_icc_card_state.js] [test_icc_info.js] [test_stk_refresh.js] diff --git a/dom/icc/tests/marionette/test_icc_card_lock_unlock_pin.js b/dom/icc/tests/marionette/test_icc_card_lock_unlock_pin.js new file mode 100644 index 00000000000..83e2eb2a718 --- /dev/null +++ b/dom/icc/tests/marionette/test_icc_card_lock_unlock_pin.js @@ -0,0 +1,68 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; + +function testUnlockPin(aIcc, aPin, aErrorName, aRetryCount) { + log("testUnlockPin with pin=" + aPin); + + return aIcc.unlockCardLock({ lockType: "pin", pin: aPin }) + .then((aResult) => { + if (aErrorName) { + ok(false, "unlocking pin should not success"); + } + }, (aError) => { + if (!aErrorName) { + ok(false, "unlocking pin should not fail"); + return; + } + + // Check the request error. + is(aError.name, aErrorName, "error.name"); + is(aError.retryCount, aRetryCount, "error.retryCount"); + }); +} + +function testUnlockPinAndWait(aIcc, aPin, aCardState) { + log("testUnlockPin with pin=" + aPin + ", and wait cardState changes to '" + + aCardState + "'"); + + let promises = []; + + promises.push(waitForTargetEvent(aIcc, "cardstatechange", function() { + return aIcc.cardState === aCardState; + })); + promises.push(testUnlockPin(aIcc, aPin)); + + return Promise.all(promises); +} + +// Start tests +startTestCommon(function() { + let icc = getMozIcc(); + let retryCount; + + // Enable PIN-lock. + return setPinLockEnabled(icc, true) + // Reset card state to "pinRequired" by restarting radio + .then(() => restartRadioAndWait("pinRequired")) + .then(() => { icc = getMozIcc(); }) + + // Get current PIN-lock retry count. + .then(() => icc.getCardLockRetryCount("pin")) + .then((aResult) => { + retryCount = aResult.retryCount; + ok(true, "pin retryCount is " + retryCount); + }) + + // Test fail to unlock PIN-lock. + // The retry count should be decreased by 1. + .then(() => testUnlockPin(icc, "1111", "IncorrectPassword", retryCount - 1)) + + // Test success to unlock PIN-lock. + .then(() => testUnlockPinAndWait(icc, DEFAULT_PIN, "ready")) + + // Restore pin state. + .then(() => setPinLockEnabled(icc, false)); +}); From c9ac1d04e6372606c08360039bc080ac9b2d6240 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Mon, 27 Oct 2014 16:14:46 +0800 Subject: [PATCH 10/44] Bug 1084233 - Part 4: Add marionette test for unlocking puk. r=hsinyi --- dom/icc/tests/marionette/head.js | 2 + dom/icc/tests/marionette/manifest.ini | 1 + .../test_icc_card_lock_unlock_puk.js | 97 +++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 dom/icc/tests/marionette/test_icc_card_lock_unlock_puk.js diff --git a/dom/icc/tests/marionette/head.js b/dom/icc/tests/marionette/head.js index c4e2692d1da..c34d1c58ce6 100644 --- a/dom/icc/tests/marionette/head.js +++ b/dom/icc/tests/marionette/head.js @@ -7,6 +7,8 @@ const PREF_KEY_RIL_DEBUGGING_ENABLED = "ril.debugging.enabled"; // The pin code hard coded in emulator is "0000". const DEFAULT_PIN = "0000"; +// The puk code hard coded in emulator is "12345678". +const DEFAULT_PUK = "12345678"; // Emulate Promise.jsm semantics. Promise.defer = function() { return new Deferred(); } diff --git a/dom/icc/tests/marionette/manifest.ini b/dom/icc/tests/marionette/manifest.ini index 251223b6ea6..4dfdff005b6 100644 --- a/dom/icc/tests/marionette/manifest.ini +++ b/dom/icc/tests/marionette/manifest.ini @@ -9,6 +9,7 @@ qemu = true [test_icc_card_lock_change_pin.js] [test_icc_card_lock_enable_pin.js] [test_icc_card_lock_unlock_pin.js] +[test_icc_card_lock_unlock_puk.js] [test_icc_card_state.js] [test_icc_info.js] [test_stk_refresh.js] diff --git a/dom/icc/tests/marionette/test_icc_card_lock_unlock_puk.js b/dom/icc/tests/marionette/test_icc_card_lock_unlock_puk.js new file mode 100644 index 00000000000..71b9b1c4400 --- /dev/null +++ b/dom/icc/tests/marionette/test_icc_card_lock_unlock_puk.js @@ -0,0 +1,97 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; + +function passingWrongPinAndWait(aIcc) { + return aIcc.getCardLockRetryCount("pin").then((aResult) => { + let promises = []; + let retryCount = aResult.retryCount; + + ok(true, "pin retryCount is " + retryCount); + + promises.push(waitForTargetEvent(aIcc, "cardstatechange", function() { + return aIcc.cardState === "pukRequired"; + })); + + for (let i = 0; i < retryCount; i++) { + promises.push(aIcc.unlockCardLock({ lockType: "pin", pin: "1111" }) + .then(() => { + ok(false, "unlocking pin should not success"); + }, function reject(aRetryCount, aError) { + // check the request error. + is(aError.name, "IncorrectPassword", "error.name"); + is(aError.retryCount, aRetryCount, "error.retryCount"); + }.bind(null, retryCount - i - 1))); + } + + return Promise.all(promises); + }); +} + +function testUnlockPuk(aIcc, aPuk, aNewPin, aErrorName, aRetryCount) { + log("testUnlockPuk with puk=" + aPuk + " and newPin=" + aNewPin); + + return aIcc.unlockCardLock({ lockType: "puk", puk: aPuk, newPin: aNewPin }) + .then((aResult) => { + if (aErrorName) { + ok(false, "unlocking puk should not success"); + } + }, (aError) => { + if (!aErrorName) { + ok(false, "unlocking puk should not fail"); + return; + } + + // Check the request error. + is(aError.name, aErrorName, "error.name"); + is(aError.retryCount, aRetryCount, "error.retryCount"); + }); +} + +function testUnlockPukAndWait(aIcc, aPuk, aNewPin, aCardState) { + log("testUnlockPuk with puk=" + aPuk + "/newPin=" + aNewPin + + ", and wait card state changes to '" + aCardState + "'"); + + let promises = []; + + promises.push(waitForTargetEvent(aIcc, "cardstatechange", function() { + return aIcc.cardState === aCardState; + })); + promises.push(testUnlockPuk(aIcc, aPuk, aNewPin)); + + return Promise.all(promises); +} + +// Start tests +startTestCommon(function() { + let icc = getMozIcc(); + let retryCount; + + // Enable pin lock. + return setPinLockEnabled(icc, true) + // Reset card state to "pinRequired" by restarting radio + .then(() => restartRadioAndWait("pinRequired")) + .then(() => { icc = getMozIcc() }) + // Switch cardState to "pukRequired" by entering wrong pin code. + .then(() => passingWrongPinAndWait(icc)) + + // Get current PUK-lock retry count. + .then(() => icc.getCardLockRetryCount("puk")) + .then((aResult) => { + retryCount = aResult.retryCount; + ok(true, "puk retryCount is " + retryCount); + }) + + // Test unlock PUK code fail. + // The retry count should be decreased by 1. + .then(() => testUnlockPuk(icc, "11111111", DEFAULT_PIN, "IncorrectPassword", + retryCount - 1)) + + // Test unlock PUK code success. + .then(() => testUnlockPukAndWait(icc, DEFAULT_PUK, DEFAULT_PIN, "ready")) + + // Restore pin state. + .then(() => setPinLockEnabled(icc, false)); +}); From a493b17d9c4780c52cf0a5e7b32bf50dbe54863d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 02:53:32 -0800 Subject: [PATCH 11/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6d9439660ed7 Author: viorelaioia Desc: Merge pull request #26414 from chirarobert/bug_1096915 Bug 1096915 - Add a test to re-dial the last MO number by pressing the c... ======== https://hg.mozilla.org/integration/gaia-central/rev/d54c77a626be Author: Robert Chira Desc: Bug 1096915 - Add a test to re-dial the last MO number by pressing the call button twice --- 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 c85706809d5..f1ffbc9d04c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e02a9641ec6db339f592359be0e8974db2e9b7a0", + "revision": "6d9439660ed7362e6bbb4bccea92a88374b08e5a", "repo_path": "integration/gaia-central" } From 42577c6c42d2bb0a870f69edc872e6c5c4aadcdd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 02:53:47 -0800 Subject: [PATCH 12/44] 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 c32dad5f041..e4818957d76 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 90711dc619e..3b87cc5bd22 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 0d5b315ef6b..99958cfd8c0 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 dcb18068b10..7b6a4053552 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 90711dc619e..3b87cc5bd22 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 d9a830389b4..48e430798e2 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 d0cd18bd3f7..98b24f7cdc1 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 257cae118e9..91ab86d59e8 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 261a8f6e18a..0cdb902b55e 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 bb19e8cb1db..108173416b1 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 b2959b81060..ca6ede545bc 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c1a36929869f6c8fc220515f365c5934e5e5cc65 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 04:36:53 -0800 Subject: [PATCH 13/44] Bumping gaia.json for 2 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/b710813303f9 Author: Staś Małolepszy Desc: Merge pull request #25308 from stasm/1011519-hide-ar-fr-zhTW Bug 1011519 - Use pseudolocales in tests ======== https://hg.mozilla.org/integration/gaia-central/rev/1b25f92559fc Author: Staś Małolepszy Desc: Bug 1011519 - Use pseudolocales in tests. r=gandalf r=kgrandon r=arthurcc --- 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 f1ffbc9d04c..8cc2f3c4046 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "6d9439660ed7362e6bbb4bccea92a88374b08e5a", + "revision": "b710813303f93261bc38283142d4c4ca9fe35b41", "repo_path": "integration/gaia-central" } From d43709e9934682378f8532cb2cd68abd44c18de5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 04:41:58 -0800 Subject: [PATCH 14/44] 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 e4818957d76..13311706a18 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 3b87cc5bd22..24ed2284e16 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 99958cfd8c0..734524e33d0 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 7b6a4053552..d70bfd1e883 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 3b87cc5bd22..24ed2284e16 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 48e430798e2..df65240a4f8 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 98b24f7cdc1..a611d2484a9 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 91ab86d59e8..ba101ec27c0 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 0cdb902b55e..19fec298e25 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 108173416b1..467a1d8e8a6 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 ca6ede545bc..6503fa4e98d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 83142a2810ab6c9bb7a2e87a2744f718d61145b0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 06:21:54 -0800 Subject: [PATCH 15/44] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e4822b34a357 Author: tamarahills Desc: Merge pull request #25909 from tamarahills/bugfix/1078448 Bug 1078448 - Modify call_screen_window.js reloadWindow to not leak Call... ======== https://hg.mozilla.org/integration/gaia-central/rev/a15b584927c9 Author: Tamara Hills Desc: Bug 1078448 - Modify call_screen_window.js reloadWindow to not leak CallScreen app instances. r=drs. ======== https://hg.mozilla.org/integration/gaia-central/rev/38844206ba88 Author: Florin Strugariu Desc: Merge pull request #26447 from davehunt/bug1074117-gallery Bug 1074117 - Use expected conditions and optimise element lookups in gallery app object ======== https://hg.mozilla.org/integration/gaia-central/rev/8ee272531ef9 Author: Dave Hunt Desc: Bug 1074117 - Use expected conditions and optimise element lookups in email app object. r=fstrugariu --- 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 8cc2f3c4046..783a60dc8de 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b710813303f93261bc38283142d4c4ca9fe35b41", + "revision": "e4822b34a3571fabf58b7769230b12452fbba73d", "repo_path": "integration/gaia-central" } From c4392e69509599b80cf197e2744c48b0d19bbeba Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 06:31:58 -0800 Subject: [PATCH 16/44] 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 13311706a18..3a996417be3 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 24ed2284e16..41fd961ea17 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 734524e33d0..23a989b8a24 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 d70bfd1e883..663b8a3c57c 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 24ed2284e16..41fd961ea17 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 df65240a4f8..0f5ed308edd 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 a611d2484a9..d24acc7bf60 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 ba101ec27c0..6fc8ed67418 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 19fec298e25..b36d358627a 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 467a1d8e8a6..81a56a93e75 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 6503fa4e98d..99cd19e293f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From aa159a1703c4b90309bab68b06e1ed418cf44143 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 06:51:56 -0800 Subject: [PATCH 17/44] Bumping gaia.json for 4 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/95ec6dd29009 Author: Hubert Figuière Desc: Merge pull request #26454 from hfiguiere/tray-player-rtl Bug 1058727 - fix the notification tray playback control in RTL. r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/3f46dbfdc16a Author: Hubert Figuière Desc: Bug 1058727 - fix the notification tray playback control in RTL ======== https://hg.mozilla.org/integration/gaia-central/rev/568a6e7e5b77 Author: Wilson Page Desc: Merge pull request #26450 from wilsonpage/1104774 Bug 1104774 - [camera] Orientation broken after lock screen in preview-gallery ======== https://hg.mozilla.org/integration/gaia-central/rev/45576f05ca71 Author: Wilson Page Desc: Bug 1104774 - [camera] Orientation broken after lock screen in preview-gallery --- 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 783a60dc8de..2be388940ee 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e4822b34a3571fabf58b7769230b12452fbba73d", + "revision": "95ec6dd29009dfa578d2f622330fc0d6c8e9d21a", "repo_path": "integration/gaia-central" } From 03bc850fa39b335a88a2aff0c233f230db37f83a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 07:02:02 -0800 Subject: [PATCH 18/44] 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 3a996417be3..f5d0353a425 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 41fd961ea17..eba1aae13ea 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 23a989b8a24..b2575d26d3a 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 663b8a3c57c..bae06ff4542 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 41fd961ea17..eba1aae13ea 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 0f5ed308edd..eb2c8058c4e 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 d24acc7bf60..3ff84f29d26 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 6fc8ed67418..23e6284519a 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 b36d358627a..3d02dd51b7e 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 81a56a93e75..9caf07b0320 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 99cd19e293f..869483a69e2 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From a622ff73041a35c4c9a9cbc19f040f9c8e021ad5 Mon Sep 17 00:00:00 2001 From: Henry Chang Date: Fri, 21 Nov 2014 15:46:04 +0800 Subject: [PATCH 19/44] Bug 1098192 - Remove unused mutex for ifc_* function calls. r=vchang --- dom/network/NetUtils.cpp | 11 ----------- dom/network/NetUtils.h | 4 ---- 2 files changed, 15 deletions(-) diff --git a/dom/network/NetUtils.cpp b/dom/network/NetUtils.cpp index 40ce44812f7..5bb215f5018 100644 --- a/dom/network/NetUtils.cpp +++ b/dom/network/NetUtils.cpp @@ -28,8 +28,6 @@ GetNetUtilsLibHandle() return sNetUtilsLib; } -mozilla::Mutex NetUtils::sIfcMutex("NetUtils::sIfcMutex"); - // static void* NetUtils::GetSharedLibrary() @@ -70,14 +68,12 @@ NetUtils::NetUtils() int32_t NetUtils::do_ifc_enable(const char *ifname) { USE_DLFUNC(ifc_enable) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_enable(ifname); } int32_t NetUtils::do_ifc_disable(const char *ifname) { USE_DLFUNC(ifc_disable) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_disable(ifname); } @@ -89,7 +85,6 @@ int32_t NetUtils::do_ifc_configure(const char *ifname, in_addr_t dns2) { USE_DLFUNC(ifc_configure) - mozilla::MutexAutoLock lock(sIfcMutex); int32_t ret = ifc_configure(ifname, address, prefixLength, gateway, dns1, dns2); return ret; } @@ -98,7 +93,6 @@ int32_t NetUtils::do_ifc_reset_connections(const char *ifname, const int32_t resetMask) { USE_DLFUNC(ifc_reset_connections) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_reset_connections(ifname, resetMask); } @@ -106,7 +100,6 @@ int32_t NetUtils::do_ifc_set_default_route(const char *ifname, in_addr_t gateway) { USE_DLFUNC(ifc_set_default_route) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_set_default_route(ifname, gateway); } @@ -116,7 +109,6 @@ int32_t NetUtils::do_ifc_add_route(const char *ifname, const char *gateway) { USE_DLFUNC(ifc_add_route) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_add_route(ifname, dst, prefixLength, gateway); } @@ -126,21 +118,18 @@ int32_t NetUtils::do_ifc_remove_route(const char *ifname, const char *gateway) { USE_DLFUNC(ifc_remove_route) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_remove_route(ifname, dst, prefixLength, gateway); } int32_t NetUtils::do_ifc_remove_host_routes(const char *ifname) { USE_DLFUNC(ifc_remove_host_routes) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_remove_host_routes(ifname); } int32_t NetUtils::do_ifc_remove_default_route(const char *ifname) { USE_DLFUNC(ifc_remove_default_route) - mozilla::MutexAutoLock lock(sIfcMutex); return ifc_remove_default_route(ifname); } diff --git a/dom/network/NetUtils.h b/dom/network/NetUtils.h index d032c36b6c0..6ae2894ab12 100644 --- a/dom/network/NetUtils.h +++ b/dom/network/NetUtils.h @@ -11,7 +11,6 @@ #define NetUtils_h #include "arpa/inet.h" -#include "mozilla/Mutex.h" // Copied from ifc.h #define RESET_IPV4_ADDRESSES 0x01 @@ -59,9 +58,6 @@ public: char* vendorinfo); static int32_t SdkVersion(); - -private: - static mozilla::Mutex sIfcMutex; }; // Defines a function type with the right arguments and return type. From 9c2b5b205d79ea908504ed1f2e976c0076496553 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Tue, 25 Nov 2014 08:26:00 -0500 Subject: [PATCH 20/44] Bug 1100876 - Add showOnlyOnce to MozBehavior dict. r=mhenretty, r=smaug There are some notifications that we know we don't want to resend. For instance, Voicemail notifications are some, since everytime the network will be ready it will notify us of the status, so we don't have to resend it on reboot. We add a 'showOnlyOnce' key in the MozBehavior dict for this usecase. --- dom/notification/ChromeNotifications.js | 5 ++++ .../test_notification_resend.html | 29 +++++++++++++++++++ dom/webidl/Notification.webidl | 1 + 3 files changed, 35 insertions(+) diff --git a/dom/notification/ChromeNotifications.js b/dom/notification/ChromeNotifications.js index c24161f63e3..cf7ee9e6155 100644 --- a/dom/notification/ChromeNotifications.js +++ b/dom/notification/ChromeNotifications.js @@ -54,6 +54,11 @@ ChromeNotifications.prototype = { } catch(e) { behavior = undefined; } + + if (behavior && behavior.showOnlyOnce === true) { + return; + } + appNotifier.showAppNotification( notification.icon, notification.title, diff --git a/dom/tests/mochitest/notification/test_notification_resend.html b/dom/tests/mochitest/notification/test_notification_resend.html index ebabf86944e..8b40864af96 100644 --- a/dom/tests/mochitest/notification/test_notification_resend.html +++ b/dom/tests/mochitest/notification/test_notification_resend.html @@ -86,6 +86,35 @@ }); }, + function (done) { + info("Sending one non-resendable notification"); + var behavior = { + showOnlyOnce: true + }; + var notif = new Notification("title", { mozbehavior: behavior }); + ok(notif, "Notification object is valid"); + notifications.push(notif); + + var promise = Notification.get(); + promise.then(function (notifications) { + is(notifications.length, 1, "one notification has been sent"); + done(); + }); + }, + + function (done) { + info("Trying to resend non-resendable notification"); + var notif = notifications.pop(); + notif.onclose = function() { + done(); + }; + + navigator.mozChromeNotifications.mozResendAllNotifications(function(number) { + is(number, 0, "One notification not resent"); + notif.close(); + }); + }, + function (done) { info("Sending two notifications, closing one"); var notif1 = new Notification("title1"); diff --git a/dom/webidl/Notification.webidl b/dom/webidl/Notification.webidl index 167150d4fa1..3af977ce6f8 100644 --- a/dom/webidl/Notification.webidl +++ b/dom/webidl/Notification.webidl @@ -72,6 +72,7 @@ dictionary GetNotificationOptions { dictionary NotificationBehavior { boolean noscreen = false; boolean noclear = false; + boolean showOnlyOnce = false; DOMString soundFile = ""; sequence vibrationPattern; }; From e1fcb49e3bc348f0271352c65da6bc3e46e13869 Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Fri, 21 Nov 2014 09:34:00 -0500 Subject: [PATCH 21/44] Bug 1102986 - Update camera preview media stream with platform media stream expectations. r=roc --- dom/camera/CameraPreviewMediaStream.cpp | 21 +++++++++++++++++++++ dom/camera/CameraPreviewMediaStream.h | 2 ++ dom/camera/DOMCameraControl.cpp | 3 ++- dom/camera/DOMCameraControlListener.cpp | 1 + dom/camera/test/test_camera.html | 22 +++++++++++++++------- 5 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dom/camera/CameraPreviewMediaStream.cpp b/dom/camera/CameraPreviewMediaStream.cpp index a1d57c5a1f4..a426c277a5a 100644 --- a/dom/camera/CameraPreviewMediaStream.cpp +++ b/dom/camera/CameraPreviewMediaStream.cpp @@ -19,6 +19,8 @@ using namespace mozilla::dom; namespace mozilla { +static const TrackID TRACK_VIDEO = 2; + void FakeMediaStreamGraph::DispatchToMainThreadAfterStreamStateUpdate(already_AddRefed aRunnable) { @@ -32,6 +34,7 @@ CameraPreviewMediaStream::CameraPreviewMediaStream(DOMMediaStream* aWrapper) , mInvalidatePending(0) , mDiscardedFrames(0) , mRateLimit(false) + , mTrackCreated(false) { SetGraphImpl(MediaStreamGraph::GetInstance()); mFakeMediaStreamGraph = new FakeMediaStreamGraph(); @@ -111,6 +114,24 @@ CameraPreviewMediaStream::RemoveListener(MediaStreamListener* aListener) listener->NotifyEvent(mFakeMediaStreamGraph, MediaStreamListener::EVENT_REMOVED); } +void +CameraPreviewMediaStream::OnPreviewStateChange(bool aActive) +{ + if (aActive) { + MutexAutoLock lock(mMutex); + if (!mTrackCreated) { + mTrackCreated = true; + VideoSegment tmpSegment; + for (uint32_t j = 0; j < mListeners.Length(); ++j) { + MediaStreamListener* l = mListeners[j]; + l->NotifyQueuedTrackChanges(mFakeMediaStreamGraph, TRACK_VIDEO, 0, + MediaStreamListener::TRACK_EVENT_CREATED, + tmpSegment); + } + } + } +} + void CameraPreviewMediaStream::Destroy() { diff --git a/dom/camera/CameraPreviewMediaStream.h b/dom/camera/CameraPreviewMediaStream.h index 84536c6f6af..16077f4b07a 100644 --- a/dom/camera/CameraPreviewMediaStream.h +++ b/dom/camera/CameraPreviewMediaStream.h @@ -51,6 +51,7 @@ public: virtual void AddListener(MediaStreamListener* aListener) MOZ_OVERRIDE; virtual void RemoveListener(MediaStreamListener* aListener) MOZ_OVERRIDE; virtual void Destroy(); + void OnPreviewStateChange(bool aActive); void Invalidate(); @@ -67,6 +68,7 @@ protected: int32_t mInvalidatePending; uint32_t mDiscardedFrames; bool mRateLimit; + bool mTrackCreated; nsRefPtr mFakeMediaStreamGraph; }; diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp index e13c3c9970b..e639fcbed3d 100644 --- a/dom/camera/DOMCameraControl.cpp +++ b/dom/camera/DOMCameraControl.cpp @@ -291,7 +291,8 @@ nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId, mCurrentConfiguration = initialConfig.forget(); // Attach our DOM-facing media stream to our viewfinder stream. - mStream = mInput; + SetHintContents(HINT_CONTENTS_VIDEO); + InitStreamCommon(mInput); MOZ_ASSERT(mWindow, "Shouldn't be created with a null window!"); if (mWindow->GetExtantDoc()) { CombineWithPrincipal(mWindow->GetExtantDoc()->NodePrincipal()); diff --git a/dom/camera/DOMCameraControlListener.cpp b/dom/camera/DOMCameraControlListener.cpp index 0c8396156d4..e575cb56397 100644 --- a/dom/camera/DOMCameraControlListener.cpp +++ b/dom/camera/DOMCameraControlListener.cpp @@ -140,6 +140,7 @@ DOMCameraControlListener::OnPreviewStateChange(PreviewState aState) MOZ_ASSERT_UNREACHABLE("Invalid preview state"); return; } + mStream->OnPreviewStateChange(aState == kPreviewStarted); NS_DispatchToMainThread(new Callback(mDOMCameraControl, aState)); } diff --git a/dom/camera/test/test_camera.html b/dom/camera/test/test_camera.html index 30394e382f5..208fcfac87c 100644 --- a/dom/camera/test/test_camera.html +++ b/dom/camera/test/test_camera.html @@ -109,18 +109,26 @@ var Camera = { var blob = e.data; var img = new Image(); var test = this._currentTest; + var onPreviewStateChange = function(e) { + if (e.newState === 'started') { + ok(true, "viewfinder is ready and playing after resume"); + Camera.cameraObj.removeEventListener('previewstatechange', onPreviewStateChange); + Camera._testsCompleted++; + if(Camera._testsCompleted == Camera._tests.length) { + ok(true, "test finishing"); + SimpleTest.finish(); + } else { + Camera.runTests(); + } + } + } + Camera.cameraObj.addEventListener('previewstatechange', onPreviewStateChange); img.onload = function Imgsize() { ok(this.width == test.pictureSize.width, "The image taken has the width " + this.width + " pictureSize width = " + test.pictureSize.width); ok(this.height == test.pictureSize.height, "The image taken has the height " + this.height + " picturesize height = " + test.pictureSize.height); - Camera._testsCompleted++; - if(Camera._testsCompleted == Camera._tests.length) { - ok(true, "test finishing"); - SimpleTest.finish(); - } else { - Camera.runTests(); - } + Camera.cameraObj.resumePreview(); } ok(blob.size > 100 , "Blob Size Gathered = " + blob.size); ok("image/" + test.fileFormat == blob.type, "Blob Type = " + blob.type); From 68ced7b828f40dc802c1374c31c2a2c794a5c8a1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 07:38:26 -0800 Subject: [PATCH 22/44] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index eba1aae13ea..8a0bd0dc875 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index eba1aae13ea..8a0bd0dc875 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -23,7 +23,7 @@ - + From 982a897c68e0b6249a1752ff1220c59b63b63f95 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 09:11:55 -0800 Subject: [PATCH 23/44] Bumping gaia.json for 8 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e68d2771a8d5 Author: Tzu-Lin Huang Desc: Merge pull request #26436 from dwi2/bug1103339 Bug 1103339 - System app should not process keydown/keyup event target t... ======== https://hg.mozilla.org/integration/gaia-central/rev/e73305953dad Author: Tzu-Lin Huang Desc: Bug 1103339 - System app should not process keydown/keyup event target to embedded iframe ======== https://hg.mozilla.org/integration/gaia-central/rev/25343f6b5ce7 Author: Ryan VanderMeulen Desc: Merge pull request #26244 from mancas/bug1098611 Bug 1098611 - [FTU] UI does not update when switching networks in FTU ======== https://hg.mozilla.org/integration/gaia-central/rev/353b8bfebe28 Author: Manuel Casas Desc: Bug 1098611 - [FTU] UI does not update when switching networks in FTU ======== https://hg.mozilla.org/integration/gaia-central/rev/638251bd179a Author: Ryan VanderMeulen Desc: Merge pull request #26324 from weideng/bug1098188 Bug 1098188 - Keyboard settings can't be pre-localized when handwriting layout included. r=stas ======== https://hg.mozilla.org/integration/gaia-central/rev/ec9d4716e825 Author: wdeng Desc: Bug 1098188 - Keyboard settings can't be pre-localized when handwriting layout included ======== https://hg.mozilla.org/integration/gaia-central/rev/6b8a77262b3c Author: Ryan VanderMeulen Desc: Merge pull request #26474 from xeonchen/bug-1096236 Bug 1096236 - Remove "alternateLayoutOverwrite" in Arabic layout definition ======== https://hg.mozilla.org/integration/gaia-central/rev/8e6e5753330f Author: Liang-Heng Chen Desc: Bug 1096236 - Remove "alternateLayoutOverwrite" in Arabic layout definition. --- 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 2be388940ee..1d425d99796 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "95ec6dd29009dfa578d2f622330fc0d6c8e9d21a", + "revision": "e68d2771a8d5d992a7c3c2d35ec17d8cccf2df82", "repo_path": "integration/gaia-central" } From 73d2648cc2bf30db6ad8c9092ce74a7ed0653f5f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 09:13:28 -0800 Subject: [PATCH 24/44] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 4 ++-- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 4 ++-- 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, 13 insertions(+), 13 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f5d0353a425..9e471dd7d74 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 8a0bd0dc875..a07c298a376 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,11 +19,11 @@ - + - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index b2575d26d3a..a054e8e6236 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 bae06ff4542..c15f092abc8 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 8a0bd0dc875..a07c298a376 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,11 +19,11 @@ - + - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index eb2c8058c4e..c4b22e795b8 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 3ff84f29d26..8a9578ae97e 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 23e6284519a..919d945e46e 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 3d02dd51b7e..901779af479 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 9caf07b0320..1887adf3dc2 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 869483a69e2..0a920cc1d26 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From ec86e4ac19afd796355377451f59aad551afd21f Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Wed, 26 Nov 2014 12:40:55 -0500 Subject: [PATCH 25/44] Bug 1105295 - Stop using scrollinfo layers when event regions are enabled. r=botond --- gfx/layers/apz/src/APZCTreeManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp index b6df083b04d..b367ac9cc1d 100644 --- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -246,6 +246,9 @@ APZCTreeManager::PrepareAPZCForLayer(const LayerMetricsWrapper& aLayer, if (!aMetrics.IsScrollable()) { return nullptr; } + if (gfxPrefs::LayoutEventRegionsEnabled() && aLayer.IsScrollInfoLayer()) { + return nullptr; + } const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(aLayersId); if (!(state && state->mController.get())) { From 5e328164e89f111e117f4421babcad7bd6186b2a Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Wed, 26 Nov 2014 12:41:06 -0500 Subject: [PATCH 26/44] Bug 1085404 - When interacting with a fast-moving APZC, don't send the events to content. r=botond --- gfx/layers/apz/src/APZCTreeManager.h | 9 +++++---- gfx/layers/apz/src/InputBlockState.cpp | 19 +++++++++++++------ gfx/layers/apz/src/InputBlockState.h | 20 ++++++++++++++------ gfx/layers/apz/src/InputQueue.cpp | 9 +++++++-- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h index 2db38461ef0..d40252ce85c 100644 --- a/gfx/layers/apz/src/APZCTreeManager.h +++ b/gfx/layers/apz/src/APZCTreeManager.h @@ -143,10 +143,11 @@ public: * The following values may be returned by this function: * nsEventStatus_eConsumeNoDefault is returned to indicate the * caller should discard the event with extreme prejudice. - * Currently this is only returned if the APZ determines that - * something is in overscroll and the event should be ignored entirely. - * There may be other scenarios where this return code might be used in - * the future. + * Currently this is only returned if the APZ determines that something is + * in overscroll and the event should be ignored entirely, or if the input + * event is part of a extended gesture like flywheel scrolling, and gets + * consumed within the APZ code. There may be other scenarios where this + * return code might be used in the future. * nsEventStatus_eIgnore is returned to indicate that the APZ code didn't * use this event. This might be because it was directed at a point on * the screen where there was no APZ, or because the thing the user was diff --git a/gfx/layers/apz/src/InputBlockState.cpp b/gfx/layers/apz/src/InputBlockState.cpp index a0d7951407c..c8501883102 100644 --- a/gfx/layers/apz/src/InputBlockState.cpp +++ b/gfx/layers/apz/src/InputBlockState.cpp @@ -84,7 +84,7 @@ TouchBlockState::TouchBlockState(const nsRefPtr& aTarget , mPreventDefault(false) , mContentResponded(false) , mContentResponseTimerExpired(false) - , mSingleTapDisallowed(false) + , mDuringFastMotion(false) , mSingleTapOccurred(false) { TBS_LOG("Creating %p\n", this); @@ -164,17 +164,24 @@ TouchBlockState::IsDefaultPrevented() const } void -TouchBlockState::DisallowSingleTap() +TouchBlockState::SetDuringFastMotion() { - TBS_LOG("%p disallowing single-tap\n", this); - mSingleTapDisallowed = true; + TBS_LOG("%p setting fast-motion flag\n", this); + mDuringFastMotion = true; +} + +bool +TouchBlockState::IsDuringFastMotion() const +{ + return mDuringFastMotion; } bool TouchBlockState::SetSingleTapOccurred() { - TBS_LOG("%p attempting to set single-tap occurred; disallowed=%d\n", this, mSingleTapDisallowed); - if (!mSingleTapDisallowed) { + TBS_LOG("%p attempting to set single-tap occurred; disallowed=%d\n", + this, mDuringFastMotion); + if (!mDuringFastMotion) { mSingleTapOccurred = true; return true; } diff --git a/gfx/layers/apz/src/InputBlockState.h b/gfx/layers/apz/src/InputBlockState.h index 62014e4364e..ea70371ad1d 100644 --- a/gfx/layers/apz/src/InputBlockState.h +++ b/gfx/layers/apz/src/InputBlockState.h @@ -116,16 +116,24 @@ public: bool IsDefaultPrevented() const; /** - * Set a flag that disables setting the single-tap flag on this block. + * Sets a flag that indicates this input block occurred while the APZ was + * in a state of fast motion. This affects gestures that may be produced + * from input events in this block. */ - void DisallowSingleTap(); + void SetDuringFastMotion(); /** - * Set a flag that indicates that this touch block triggered a single tap event. - * @return true iff DisallowSingleTap was not previously called. + * @return true iff SetDuringFastMotion was called on this block. + */ + bool IsDuringFastMotion() const; + /** + * Set the single-tap-occurred flag that indicates that this touch block + * triggered a single tap event. + * @return true if the flag was set. This may not happen if, for example, + * SetDuringFastMotion was previously called. */ bool SetSingleTapOccurred(); /** - * @return true iff SetSingleTapOccurred was previously called on this block. + * @return true iff the single-tap-occurred flag is set on this block. */ bool SingleTapOccurred() const; @@ -171,7 +179,7 @@ private: bool mPreventDefault; bool mContentResponded; bool mContentResponseTimerExpired; - bool mSingleTapDisallowed; + bool mDuringFastMotion; bool mSingleTapOccurred; nsTArray mEvents; }; diff --git a/gfx/layers/apz/src/InputQueue.cpp b/gfx/layers/apz/src/InputQueue.cpp index cfd6f5724dc..bc53115ded4 100644 --- a/gfx/layers/apz/src/InputQueue.cpp +++ b/gfx/layers/apz/src/InputQueue.cpp @@ -59,7 +59,7 @@ InputQueue::ReceiveInputEvent(const nsRefPtr& aTarget, if (block->GetOverscrollHandoffChain()->HasFastMovingApzc()) { // If we're already in a fast fling, then we want the touch event to stop the fling // and to disallow the touch event from being used as part of a fling. - block->DisallowSingleTap(); + block->SetDuringFastMotion(); } block->GetOverscrollHandoffChain()->CancelAnimations(); } @@ -68,6 +68,9 @@ InputQueue::ReceiveInputEvent(const nsRefPtr& aTarget, if (!gfxPrefs::LayoutEventRegionsEnabled()) { waitForMainThread |= aTarget->NeedToWaitForContent(); } + if (block->IsDuringFastMotion()) { + waitForMainThread = false; + } if (waitForMainThread) { // We either don't know for sure if aTarget is the right APZC, or we may // need to wait to give content the opportunity to prevent-default the @@ -106,7 +109,9 @@ InputQueue::ReceiveInputEvent(const nsRefPtr& aTarget, // XXX calling ArePointerEventsConsumable on |target| may be wrong here if // the target isn't confirmed and the real target turns out to be something // else. For now assume this is rare enough that it's not an issue. - if (target && target->ArePointerEventsConsumable(block, aEvent.AsMultiTouchInput().mTouches.Length())) { + if (block->IsDuringFastMotion()) { + result = nsEventStatus_eConsumeNoDefault; + } else if (target && target->ArePointerEventsConsumable(block, aEvent.AsMultiTouchInput().mTouches.Length())) { result = nsEventStatus_eConsumeDoDefault; } From 953bef4b4c8109ed42c9d0ad32d267c2f4320c08 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 10:46:59 -0800 Subject: [PATCH 27/44] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/26fad79263f9 Author: Kevin Grandon Desc: Merge pull request #26459 from KevinGrandon/bug_1101158_use_tagged_template Bug 1101158 - Use shared tagged template library for escaping card content ======== https://hg.mozilla.org/integration/gaia-central/rev/3bbe686afb35 Author: Kevin Grandon Desc: Bug 1101158 - Use shared tagged template library for escaping card content r=aus r=freddyb ======== https://hg.mozilla.org/integration/gaia-central/rev/de0c1f0eb0f8 Author: Francisco Jordano Desc: Merge pull request #26238 from arcturus/bug-1064502 Bug 1064502 - [RTL] Contacts List - Letters should not overlap contact names and faces. r=sergi ======== https://hg.mozilla.org/integration/gaia-central/rev/a67ddd34d779 Author: Francisco Jordano Desc: Bug 1064502 - [RTL] Contacts List - Letters should not overlap contact names and faces. r=sergi --- 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 1d425d99796..a0e5bbbe7fb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e68d2771a8d5d992a7c3c2d35ec17d8cccf2df82", + "revision": "26fad79263f99da4a94cec6a2c49a64bd4d8f62c", "repo_path": "integration/gaia-central" } From 4e45cb2e4a95fafe82cfb33942f13fefdf3d8754 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 10:56:35 -0800 Subject: [PATCH 28/44] 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 9e471dd7d74..af44fc4db3b 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 a07c298a376..39e581fe00c 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 a054e8e6236..837bc711b8f 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 c15f092abc8..216216c5014 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 a07c298a376..39e581fe00c 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 c4b22e795b8..b925b65e66d 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 8a9578ae97e..d5fdc498d72 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 919d945e46e..13d41a2abe3 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 901779af479..3027e855754 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 1887adf3dc2..46163f5c69e 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 0a920cc1d26..9589eae689c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e25277fc94215cc758b8883cb1f1fc955df45e9b Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Wed, 26 Nov 2014 13:58:15 -0500 Subject: [PATCH 29/44] Bug 1105016 - Update tld to pld in debug logging. r=mstange DONTBUILD because NPOTB --- layout/base/FrameLayerBuilder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp index 4e4140bc84b..81e31754eb0 100644 --- a/layout/base/FrameLayerBuilder.cpp +++ b/layout/base/FrameLayerBuilder.cpp @@ -275,9 +275,9 @@ public: */ nsAutoCString mLog; - #define FLB_LOG_PAINTED_LAYER_DECISION(tld, ...) \ - tld->mLog.AppendPrintf("\t\t\t\t"); \ - tld->mLog.AppendPrintf(__VA_ARGS__); + #define FLB_LOG_PAINTED_LAYER_DECISION(pld, ...) \ + pld->mLog.AppendPrintf("\t\t\t\t"); \ + pld->mLog.AppendPrintf(__VA_ARGS__); #else #define FLB_LOG_PAINTED_LAYER_DECISION(...) #endif @@ -309,7 +309,7 @@ public: */ void AccumulateEventRegions(nsDisplayLayerEventRegions* aEventRegions) { - FLB_LOG_PAINTED_LAYER_DECISION(this, "Accumulating event regions %p against tld=%p\n", aEventRegions, this); + FLB_LOG_PAINTED_LAYER_DECISION(this, "Accumulating event regions %p against pld=%p\n", aEventRegions, this); mHitRegion.Or(mHitRegion, aEventRegions->HitRegion()); mMaybeHitRegion.Or(mMaybeHitRegion, aEventRegions->MaybeHitRegion()); @@ -2106,7 +2106,7 @@ ContainerState::PopPaintedLayerData() nsRefPtr layer; nsRefPtr imageContainer = data->CanOptimizeImageLayer(mBuilder); - FLB_LOG_PAINTED_LAYER_DECISION(data, "Selecting layer for tld=%p\n", data); + FLB_LOG_PAINTED_LAYER_DECISION(data, "Selecting layer for pld=%p\n", data); FLB_LOG_PAINTED_LAYER_DECISION(data, " Solid=%i, hasImage=%i, canOptimizeAwayPaintedLayer=%i\n", data->mIsSolidColorInVisibleRegion, !!imageContainer, CanOptimizeAwayPaintedLayer(data, mLayerBuilder)); @@ -2347,7 +2347,7 @@ PaintedLayerData::Accumulate(ContainerState* aState, const nsIntRect& aDrawRect, const DisplayItemClip& aClip) { - FLB_LOG_PAINTED_LAYER_DECISION(this, "Accumulating dp=%s(%p), f=%p against tld=%p\n", aItem->Name(), aItem, aItem->Frame(), this); + FLB_LOG_PAINTED_LAYER_DECISION(this, "Accumulating dp=%s(%p), f=%p against pld=%p\n", aItem->Name(), aItem, aItem->Frame(), this); bool snap; nsRect itemBounds = aItem->GetBounds(aState->mBuilder, &snap); From c06efe37aadd5f2cf6585940fc91a3bbf9cb26b6 Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Thu, 20 Nov 2014 10:48:00 -0500 Subject: [PATCH 30/44] Bug 1097814 - Fix fake hardware buttons in mulet. r=paul, r=vingtetun --- b2g/components/SystemAppProxy.jsm | 8 ++++- .../responsivedesign/responsivedesign.jsm | 32 +++++++++---------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/b2g/components/SystemAppProxy.jsm b/b2g/components/SystemAppProxy.jsm index 064b0af595f..eec500de31a 100644 --- a/b2g/components/SystemAppProxy.jsm +++ b/b2g/components/SystemAppProxy.jsm @@ -89,10 +89,16 @@ let SystemAppProxy = { }, // Now deprecated, use sendCustomEvent with a custom event name - dispatchEvent: function systemApp_sendChromeEvent(details, target) { + dispatchEvent: function systemApp_dispatchEvent(details, target) { return this._sendCustomEvent('mozChromeEvent', details, false, target); }, + dispatchKeyboardEvent: function systemApp_dispatchKeyboardEvent(type, details) { + let content = this._frame ? this._frame.contentWindow : null; + let e = new content.KeyboardEvent(type, details); + content.dispatchEvent(e); + }, + // Listen for dom events on the system app addEventListener: function systemApp_addEventListener() { let content = this._frame ? this._frame.contentWindow : null; diff --git a/browser/devtools/responsivedesign/responsivedesign.jsm b/browser/devtools/responsivedesign/responsivedesign.jsm index 4feb039976d..9a1d506ca7b 100644 --- a/browser/devtools/responsivedesign/responsivedesign.jsm +++ b/browser/devtools/responsivedesign/responsivedesign.jsm @@ -482,11 +482,11 @@ ResponsiveUI.prototype = { sleepButton.className = "devtools-responsiveui-sleep-button"; sleepButton.setAttribute("top", 0); sleepButton.setAttribute("right", 0); - sleepButton.addEventListener("mousedown", function() { - SystemAppProxy.dispatchEvent({type: "sleep-button-press"}); + sleepButton.addEventListener("mousedown", () => { + SystemAppProxy.dispatchKeyboardEvent("keydown", {key: "Power"}); }); - sleepButton.addEventListener("mouseup", function() { - SystemAppProxy.dispatchEvent({type: "sleep-button-release"}); + sleepButton.addEventListener("mouseup", () => { + SystemAppProxy.dispatchKeyboardEvent("keyup", {key: "Power"}); }); this.stack.appendChild(sleepButton); @@ -497,20 +497,20 @@ ResponsiveUI.prototype = { let volumeUp = this.chromeDoc.createElement("button"); volumeUp.className = "devtools-responsiveui-volume-up-button"; - volumeUp.addEventListener("mousedown", function() { - SystemAppProxy.dispatchEvent({type: "volume-up-button-press"}); + volumeUp.addEventListener("mousedown", () => { + SystemAppProxy.dispatchKeyboardEvent("keydown", {key: "VolumeUp"}); }); - volumeUp.addEventListener("mouseup", function() { - SystemAppProxy.dispatchEvent({type: "volume-up-button-release"}); + volumeUp.addEventListener("mouseup", () => { + SystemAppProxy.dispatchKeyboardEvent("keyup", {key: "VolumeUp"}); }); let volumeDown = this.chromeDoc.createElement("button"); volumeDown.className = "devtools-responsiveui-volume-down-button"; - volumeDown.addEventListener("mousedown", function() { - SystemAppProxy.dispatchEvent({type: "volume-down-button-press"}); + volumeDown.addEventListener("mousedown", () => { + SystemAppProxy.dispatchKeyboardEvent("keydown", {key: "VolumeDown"}); }); - volumeDown.addEventListener("mouseup", function() { - SystemAppProxy.dispatchEvent({type: "volume-down-button-release"}); + volumeDown.addEventListener("mouseup", () => { + SystemAppProxy.dispatchKeyboardEvent("keyup", {key: "VolumeDown"}); }); volumeButtons.appendChild(volumeUp); @@ -524,11 +524,11 @@ ResponsiveUI.prototype = { let homeButton = this.chromeDoc.createElement("toolbarbutton"); homeButton.className = "devtools-responsiveui-toolbarbutton devtools-responsiveui-home-button"; - homeButton.addEventListener("mousedown", function() { - SystemAppProxy.dispatchEvent({type: "home-button-press"}); + homeButton.addEventListener("mousedown", () => { + SystemAppProxy.dispatchKeyboardEvent("keydown", {key: "Home"}); }); - homeButton.addEventListener("mouseup", function() { - SystemAppProxy.dispatchEvent({type: "home-button-release"}); + homeButton.addEventListener("mouseup", () => { + SystemAppProxy.dispatchKeyboardEvent("keyup", {key: "Home"}); }); bottomToolbar.appendChild(homeButton); this.bottomToolbar = bottomToolbar; From 11bf623e7b0e14c515e18332ceab02c26dca562f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 11:21:56 -0800 Subject: [PATCH 31/44] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b9eae46e87a2 Author: autolander Desc: Bug 1105078 - merge pull request #26462 from KevinGrandon:bug_1105078_remove_crash_reporter_strings to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/f39cb006488e Author: Kevin Grandon Desc: Bug 1105078 - Remove strings from index.html for crash reporter dialog r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/de3bb419776d Author: autolander Desc: Bug 1105077 - merge pull request #26463 from KevinGrandon:bug_1105077_remove_strings to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/7b64655e4f2b Author: Kevin Grandon Desc: Bug 1105077 - Remove strings from index.html for rocketbar and utility tray ======== https://hg.mozilla.org/integration/gaia-central/rev/2db31c7b808c Author: autolander Desc: Bug 1105079 - merge pull request #26461 from KevinGrandon:bug_1105079_remove_crash_info_strings to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/d7959409b127 Author: Kevin Grandon Desc: Bug 1105079 - Remove strings from index.html for crash info page --- 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 a0e5bbbe7fb..fb32c713e03 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "26fad79263f99da4a94cec6a2c49a64bd4d8f62c", + "revision": "b9eae46e87a2364ee1d7c6eb5d2467a69c3aadfa", "repo_path": "integration/gaia-central" } From 01c56ecde510c5d8c02013ffbea8c6da5bf3aaee Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 11:27:00 -0800 Subject: [PATCH 32/44] 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 af44fc4db3b..4431470e14f 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 39e581fe00c..b4cb173cc4b 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 837bc711b8f..23fb8090d1d 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 216216c5014..4b99b9de384 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 39e581fe00c..b4cb173cc4b 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 b925b65e66d..3e33a49defd 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 d5fdc498d72..f041c545be2 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 13d41a2abe3..ec3ea086406 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 3027e855754..64db49a69c1 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 46163f5c69e..7cdd4f27293 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 9589eae689c..755f83dae25 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 72d64b2e7b0cde3a6f64e474c4648332593f2a0d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 11:36:55 -0800 Subject: [PATCH 33/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f3637cd27193 Author: Michael Henretty Desc: Merge pull request #26479 from albertopq/1104919-rocketbar-maximize Bug 1104919 - Recalculate statusbar when rocketbar expanded r=mhenretty ======== https://hg.mozilla.org/integration/gaia-central/rev/67fb49478556 Author: albertopq Desc: Bug 1104919 - Recalculate statusbar when rocketbar expanded --- 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 fb32c713e03..c5ee647c448 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b9eae46e87a2364ee1d7c6eb5d2467a69c3aadfa", + "revision": "f3637cd27193e8eca7796781ef2f3a4fbcbe06a1", "repo_path": "integration/gaia-central" } From baaf1d9fcafa477dbcf71cc63c9de3e5a35cc675 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 11:41:58 -0800 Subject: [PATCH 34/44] 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 4431470e14f..a21b3d64e8b 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 b4cb173cc4b..8e7fe4c28b7 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 23fb8090d1d..5dc287bdda0 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 4b99b9de384..d6ca55aaf8d 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 b4cb173cc4b..8e7fe4c28b7 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 3e33a49defd..5a92a91f052 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 f041c545be2..f844a37677e 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 ec3ea086406..b9b7721d97d 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 64db49a69c1..c00f5ade008 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 7cdd4f27293..a421162d037 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 755f83dae25..730cc9a8e51 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From abbacc7378e003f3cfd43a7f3fddfd4ec8584413 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 11:50:17 -0800 Subject: [PATCH 35/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b810b68a8db1 Author: Rob Wood Desc: Merge pull request #26416 from rwood-moz/bug1095080 Bug 1095080 - Fix browser endurance tests ======== https://hg.mozilla.org/integration/gaia-central/rev/f6cf8d26719e Author: Rob Wood Desc: Bug 1095080 - Fix browser endurance tests --- 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 c5ee647c448..c3cae654ebc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f3637cd27193e8eca7796781ef2f3a4fbcbe06a1", + "revision": "b810b68a8db1dc162cc96123fc3e2732278ce24f", "repo_path": "integration/gaia-central" } From 8cda17948aa1ffa25c6899bdeecfd8c55ef369b4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 11:57:11 -0800 Subject: [PATCH 36/44] 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 a21b3d64e8b..b43412018c9 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 8e7fe4c28b7..0f4233a1c62 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 5dc287bdda0..447744df956 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 d6ca55aaf8d..f05ad1abafe 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 8e7fe4c28b7..0f4233a1c62 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 5a92a91f052..44fbb86c8c8 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 f844a37677e..269c0c29ce6 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 b9b7721d97d..a7bedcbc1a5 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 c00f5ade008..4b25618475e 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 a421162d037..b1559c0b23a 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 730cc9a8e51..cf8e2eef85b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 78034a756a3e633ec1893c8f0772438c4d911ad1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 15:11:59 -0800 Subject: [PATCH 37/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ff2728add438 Author: autolander Desc: Bug 1105521 - merge pull request #26500 from KevinGrandon:bug_1105521_remove_strings_sleep_menu to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/f13af46b1fd6 Author: Kevin Grandon Desc: Bug 1105521 - Remove strings from index.html for sleep menu --- 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 c3cae654ebc..e24aac31ba0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b810b68a8db1dc162cc96123fc3e2732278ce24f", + "revision": "ff2728add4389e6bb7d48c9856ad37486e955734", "repo_path": "integration/gaia-central" } From b35a7039ebf2dacd3de58d2f0b9aa169943f65b0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 15:17:08 -0800 Subject: [PATCH 38/44] 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 b43412018c9..f004231353d 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 0f4233a1c62..82fd9ea9f28 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 447744df956..b6216b165b0 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 f05ad1abafe..45523d2f4a9 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 0f4233a1c62..82fd9ea9f28 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 44fbb86c8c8..8c939e1e538 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 269c0c29ce6..325fc26f4f3 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 a7bedcbc1a5..f254a030224 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 4b25618475e..da1a811ca4a 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 b1559c0b23a..b7845717d4e 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 cf8e2eef85b..966615c7532 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4e394e3a3e393a91c107ecd9ed8850938dbb01e0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 15:41:56 -0800 Subject: [PATCH 39/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/55dad48c2099 Author: autolander Desc: Bug 1105519 - merge pull request #26499 from KevinGrandon:bug_1105519_battery_overlay_strings to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/bb6df9503c2c Author: Kevin Grandon Desc: Bug 1105519 - Remove strings from index.html for battery dialog r=kgrandon --- 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 e24aac31ba0..1d6d4e0b63c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ff2728add4389e6bb7d48c9856ad37486e955734", + "revision": "55dad48c2099b7bad629d56ebcc6ddfd5fe09a8c", "repo_path": "integration/gaia-central" } From eb65e96d56ac68345162fe810c3f3a1a3331957f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 15:52:02 -0800 Subject: [PATCH 40/44] 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 f004231353d..aa4f01363ad 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 82fd9ea9f28..3929549d57c 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 b6216b165b0..32099e31252 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 45523d2f4a9..d2f7a7383fa 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 82fd9ea9f28..3929549d57c 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 8c939e1e538..0a0abf8fa74 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 325fc26f4f3..a4ec5ce9622 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 f254a030224..38d1343fd74 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 da1a811ca4a..bcb93ab145d 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 b7845717d4e..b5d546725f7 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 966615c7532..6f13fb7b402 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From ffafa27787bd9c9ee571b7bcdbc39bd40358b490 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 16:17:00 -0800 Subject: [PATCH 41/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c8ac536548db Author: autolander Desc: Bug 1103629 - merge pull request #26384 from KevinGrandon:bug_1103629_marionette_client_loader_verticalhome to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/a1796499b69e Author: Kevin Grandon Desc: Bug 1103629 - [HomeScreen] Use a marionette client loader to include the home screen 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 1d6d4e0b63c..b1098f3c2eb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "55dad48c2099b7bad629d56ebcc6ddfd5fe09a8c", + "revision": "c8ac536548dbbda88d8730b21068ff9779950d8c", "repo_path": "integration/gaia-central" } From d11fa05feddaa1c1de1ff6cf716173b77e22c7e1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 16:21:35 -0800 Subject: [PATCH 42/44] 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 aa4f01363ad..b9df42700d3 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 3929549d57c..8dbb684a549 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 32099e31252..873c870d9a5 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 d2f7a7383fa..4ad2efdbab1 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 3929549d57c..8dbb684a549 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 0a0abf8fa74..64dcd537b2b 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 a4ec5ce9622..3e63ca8dc3b 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 38d1343fd74..cfba5536362 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 bcb93ab145d..89c17096bb7 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 b5d546725f7..4322fed33b3 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 6f13fb7b402..4e84f9a57b9 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4b8882a2815278d183ed1dcfd261678d0eb21c6f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 18:31:57 -0800 Subject: [PATCH 43/44] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/05f40074f94c Author: Kevin Grandon Desc: Merge pull request #26502 from KevinGrandon/bug_1103964_disable_test Bug 1103964 - Disable test_everythingme_add_collection_save_bookmark.py test for starting to perma-fail ======== https://hg.mozilla.org/integration/gaia-central/rev/89e1ef758a65 Author: Kevin Grandon Desc: Bug 1103964 - Disable test_everythingme_add_collection_save_bookmark.py test for starting to perma-fail --- 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 b1098f3c2eb..929aad28a19 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "c8ac536548dbbda88d8730b21068ff9779950d8c", + "revision": "05f40074f94c58315e6c353089d31e8e20ea3c1a", "repo_path": "integration/gaia-central" } From a41bd80ce4a32768331df3b0e1ec1a8864cb0610 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 26 Nov 2014 18:33:31 -0800 Subject: [PATCH 44/44] 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 b9df42700d3..e4cc771c2bb 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 8dbb684a549..c9d54c6757f 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 873c870d9a5..ed387042d12 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 4ad2efdbab1..ad60eff4b4c 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 8dbb684a549..c9d54c6757f 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 64dcd537b2b..34b089a0bcd 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 3e63ca8dc3b..48df4ae3051 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 cfba5536362..e2e88be0e27 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 89c17096bb7..7641dc77158 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 4322fed33b3..0e91c75bf87 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 4e84f9a57b9..583817be35e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +