From 906c43fc72c0e4c13ea43c7c1b2af2d37121c815 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 05:37:53 -0700 Subject: [PATCH 01/18] Bumping manifests a=b2g-bump --- 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/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 46e75774f11..0ff65430697 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1355f49c832..947519f13dd 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1d100ec4677..ee221980e9b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -22,7 +22,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 46e75774f11..0ff65430697 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d9d6f2378d0..4df07da94a5 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a796d6582f7..40ea7046dbf 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -22,7 +22,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 1acbbc8f2c2..d3f0beaf75c 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -24,7 +24,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 9756514d4fc..b838a2bfb86 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -22,7 +22,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index eebf2e6be3a..77ac4eaa9ee 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index a68ab83cd5e..8d4ea505489 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -22,7 +22,7 @@ - + From 21100acb5201c3d917c263046def9746049dfb52 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 30 Apr 2014 09:18:00 -0400 Subject: [PATCH 02/18] Bug 990086 - Fix local simulator builds on Mac. r=glandium --- b2g/installer/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in index 77c330fab29..5dc7f496150 100644 --- a/b2g/installer/Makefile.in +++ b/b2g/installer/Makefile.in @@ -86,7 +86,7 @@ simulator: make-package @echo 'Building simulator addon...' $(PYTHON) $(topsrcdir)/b2g/simulator/build_xpi.py $(MOZ_PKG_PLATFORM) -default:: simulator +libs:: simulator # Ensure copying Simulator xpi to ftp UPLOAD_EXTRA_FILES += fxos-simulator-*-*.xpi From 4410135cd1f5d63d2b87b49434d0396f5967dc8d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 08:55:40 -0700 Subject: [PATCH 03/18] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5b7dbc28c71b Author: Ryan VanderMeulen Desc: Merge pull request #18099 from Moz-TedC/bug-974794-vietnamese-ime-plus-telex Bug 974794: Vietnamese IME. Incorporates Trung Ngo's Telex IME code. ======== https://hg.mozilla.org/integration/gaia-central/rev/984e8613bbda Author: Ted Clancy (:tedders1) Desc: Bug 974794: Vietnamese IME. Incorporates Trung Ngo's Telex IME code. ======== https://hg.mozilla.org/integration/gaia-central/rev/13b6db7a3c0e Author: Ryan VanderMeulen Desc: Merge pull request #17553 from svic/Bug_969277 Bug 969277 - NFC pairing UI ======== https://hg.mozilla.org/integration/gaia-central/rev/b561b527f1ce Author: Arno Puder Desc: Bug 969277 - NFC pairing UI. 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 f0e73d5e9bf..7a59dddcc4b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "89e8095a1515d9ff7671400baa0a6a50161394ba", + "revision": "5b7dbc28c71bd5e8da989df05701e279c5ec8fe4", "repo_path": "/integration/gaia-central" } From ee13faf8ae2d0413c928cee36a75eb35b61479ae Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 09:01:35 -0700 Subject: [PATCH 04/18] Bumping manifests a=b2g-bump --- 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/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0ff65430697..fa72d0a4a40 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 947519f13dd..ff92829552a 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 ee221980e9b..681680d0332 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 0ff65430697..fa72d0a4a40 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 4df07da94a5..579d7e647a9 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 40ea7046dbf..e5c9600d5e1 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 b1cd2ab00d2..c0a84bf7898 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index d3f0beaf75c..5ca2718c416 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index b838a2bfb86..33f97c30c10 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 77ac4eaa9ee..512d103e0cd 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 8d4ea505489..eaf0c534119 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From de9334e33e578e9267cab52e65c4e1a72c880acf Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Fri, 2 May 2014 00:24:11 +0800 Subject: [PATCH 05/18] Bug 999458 - 2.a/2: re-enable some mobileconnection test cases. r=echen --- dom/mobileconnection/tests/marionette/manifest.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/manifest.ini b/dom/mobileconnection/tests/marionette/manifest.ini index 8c7a5d06706..d91146c3605 100644 --- a/dom/mobileconnection/tests/marionette/manifest.ini +++ b/dom/mobileconnection/tests/marionette/manifest.ini @@ -5,17 +5,14 @@ qemu = true [test_mobile_networks.js] [test_mobile_voice_state.js] -disabled = Bug 999458 [test_mobile_voice_location.js] [test_mobile_operator_names.js] [test_mobile_operator_names_plmnlist.js] -disabled = Bug 999458 [test_mobile_operator_names_roaming.js] [test_mobile_preferred_network_type.js] [test_mobile_data_connection.js] [test_mobile_data_location.js] [test_mobile_data_state.js] -disabled = Bug 999458 [test_mobile_mmi.js] [test_mobile_mmi_change_pin.js] [test_mobile_roaming_preference.js] From 1cafec368ae5883ac30b5cd7be466ef30c01f84f Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Fri, 2 May 2014 00:24:12 +0800 Subject: [PATCH 06/18] Bug 999458 - 2.b/2: add two more utility functions to head.js. r=echen * setEmulatorGsmLocationAndWait * setEmulatorOperatorNamesAndWait --- dom/mobileconnection/tests/marionette/head.js | 64 +++++++++++++++++++ .../marionette/test_mobile_data_location.js | 5 +- .../marionette/test_mobile_operator_names.js | 6 +- .../test_mobile_operator_names_plmnlist.js | 6 +- .../test_mobile_operator_names_roaming.js | 10 +-- .../marionette/test_mobile_voice_location.js | 5 +- 6 files changed, 72 insertions(+), 24 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/head.js b/dom/mobileconnection/tests/marionette/head.js index 5e88664afaa..f4e6d76183f 100644 --- a/dom/mobileconnection/tests/marionette/head.js +++ b/dom/mobileconnection/tests/marionette/head.js @@ -547,6 +547,33 @@ function setEmulatorGsmLocation(aLac, aCid) { return runEmulatorCmdSafe(cmd); } +/** + * Set GSM location and wait for voice and/or data state change. + * + * Fulfill params: (none) + * + * @param aLac + * @param aCid + * @param aWaitVoice [optional] + * A boolean value. Default true. + * @param aWaitData [optional] + * A boolean value. Default false. + * + * @return A deferred promise. + */ +function setEmulatorGsmLocationAndWait(aLac, aCid, + aWaitVoice = true, aWaitData = false) { + let promises = []; + if (aWaitVoice) { + promises.push(waitForManagerEvent("voicechange")); + } + if (aWaitData) { + promises.push(waitForManagerEvent("datachange")); + } + promises.push(setEmulatorGsmLocation(aLac, aCid)); + return Promise.all(promises); +} + /** * Get emulator operators info. * @@ -622,6 +649,43 @@ function setEmulatorOperatorNames(aOperator, aLongName, aShortName, aMcc, aMnc) }); } +/** + * Set emulator operators info and wait for voice and/or data state change. + * + * Fulfill params: (none) + * + * @param aOperator + * "home" or "roaming". + * @param aLongName + * A string. + * @param aShortName + * A string. + * @param aMcc [optional] + * A string. + * @param aMnc [optional] + * A string. + * @param aWaitVoice [optional] + * A boolean value. Default true. + * @param aWaitData [optional] + * A boolean value. Default false. + * + * @return A deferred promise. + */ +function setEmulatorOperatorNamesAndWait(aOperator, aLongName, aShortName, + aMcc, aMnc, + aWaitVoice = true, aWaitData = false) { + let promises = []; + if (aWaitVoice) { + promises.push(waitForManagerEvent("voicechange")); + } + if (aWaitData) { + promises.push(waitForManagerEvent("datachange")); + } + promises.push(setEmulatorOperatorNames(aOperator, aLongName, aShortName, + aMcc, aMnc)); + return Promise.all(promises); +} + let _networkManager; /** diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_location.js b/dom/mobileconnection/tests/marionette/test_mobile_data_location.js index 06e4d4d3bd0..035b3418270 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_data_location.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_location.js @@ -26,10 +26,7 @@ function testDataCellLocationUpdate(aLac, aCid) { // Set emulator's lac/cid and wait for 'ondatachange' event. log("Test cell location with lac=" + aLac + " and cid=" + aCid); - let promises = []; - promises.push(waitForManagerEvent("datachange")); - promises.push(setEmulatorGsmLocation(aLac, aCid)); - return Promise.all(promises) + return setEmulatorGsmLocationAndWait(aLac, aCid, false, true) .then(() => verifyDataCellLocationInfo(aLac, aCid)); } diff --git a/dom/mobileconnection/tests/marionette/test_mobile_operator_names.js b/dom/mobileconnection/tests/marionette/test_mobile_operator_names.js index 5b5a5eec82f..2f1b460ac33 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_operator_names.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_operator_names.js @@ -16,10 +16,8 @@ function check(aLongName, aShortName) { function test(aLongName, aShortName) { log("Testing '" + aLongName + "', '" + aShortName + "':"); - let promises = []; - promises.push(waitForManagerEvent("voicechange")); - promises.push(setEmulatorOperatorNames("home", aLongName, aShortName)); - return Promise.all(promises) + return setEmulatorOperatorNamesAndWait("home", aLongName, aShortName, + null, null, true, false) .then(() => check(aLongName, aShortName)); } diff --git a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js index 6f6df68e818..6a3958fb71e 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js @@ -17,10 +17,8 @@ function test(aLongName, aShortName, aMcc, aMnc, aExpectedLongName, aExpectedShortName) { log("Testing mcc = " + aMcc + ", mnc = " + aMnc + ":"); - let promises = []; - promises.push(waitForManagerEvent("voicechange")); - promises.push(setEmulatorOperatorNames("home", aLongName, aShortName, aMcc, aMnc)); - return Promise.all(promises) + return setEmulatorOperatorNamesAndWait("home", aLongName, aShortName, + aMcc, aMnc, true, false) .then(() => check(aExpectedLongName, aExpectedShortName, aMcc, aMnc)); } diff --git a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_roaming.js b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_roaming.js index e38ec2937d0..9912d415b8a 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_roaming.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_roaming.js @@ -13,13 +13,6 @@ function check(aLongName, aShortName, aRoaming) { is(voice.roaming, aRoaming, "voice.roaming"); } -function setEmulatorOperatorNamesAndWait(aWhich, aLongName, aShortName) { - let promises = []; - promises.push(waitForManagerEvent("voicechange")); - promises.push(setEmulatorOperatorNames(aWhich, aLongName, aShortName)); - return Promise.all(promises); -} - // See bug 797972 - B2G RIL: False roaming situation // // Steps to test: @@ -34,7 +27,8 @@ function test(aLongName, aShortName, aRoaming) { return Promise.resolve() // We should not have voicechange here, but, yes, we do. - .then(() => setEmulatorOperatorNamesAndWait("roaming", aLongName, aShortName)) + .then(() => setEmulatorOperatorNamesAndWait("roaming", aLongName, aShortName, + null, null, true, false)) .then(() => setEmulatorVoiceDataStateAndWait("voice", "roaming")) .then(() => check(aLongName, aShortName, aRoaming)) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js b/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js index eb977b5afc6..9196a887dfc 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js @@ -26,10 +26,7 @@ function testVoiceCellLocationUpdate(aLac, aCid) { // Set emulator's lac/cid and wait for 'onvoicechange' event. log("Test cell location with lac=" + aLac + " and cid=" + aCid); - let promises = []; - promises.push(waitForManagerEvent("voicechange")); - promises.push(setEmulatorGsmLocation(aLac, aCid)); - return Promise.all(promises) + return setEmulatorGsmLocationAndWait(aLac, aCid, true, false) .then(() => verifyVoiceCellLocationInfo(aLac, aCid)); } From 710c3fadc770d8537633d958cc0cf9fdb102d595 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Fri, 2 May 2014 00:24:12 +0800 Subject: [PATCH 07/18] Bug 999458 - 2.c/2: 0 <= gsmLocationAreaCode <= 65535. r=echen --- dom/mobileconnection/tests/marionette/head.js | 3 --- .../tests/marionette/test_mobile_data_location.js | 2 -- .../tests/marionette/test_mobile_data_state.js | 12 ++++++------ .../tests/marionette/test_mobile_voice_location.js | 2 -- .../tests/marionette/test_mobile_voice_state.js | 12 ++++++------ dom/system/gonk/ril_worker.js | 2 +- 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/head.js b/dom/mobileconnection/tests/marionette/head.js index f4e6d76183f..5c017f3c15b 100644 --- a/dom/mobileconnection/tests/marionette/head.js +++ b/dom/mobileconnection/tests/marionette/head.js @@ -523,10 +523,7 @@ function getEmulatorGsmLocation() { is(aResults[1].substring(0,2), "ci", "ci output"); let lac = parseInt(aResults[0].substring(5)); - lac = (lac < 0 ? 65535 : lac); let cid = parseInt(aResults[1].substring(4)); - cid = (cid < 0 ? 268435455 : cid); - return { lac: lac, cid: cid }; }); } diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_location.js b/dom/mobileconnection/tests/marionette/test_mobile_data_location.js index 035b3418270..5f8ad218eb6 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_data_location.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_location.js @@ -8,8 +8,6 @@ function verifyDataCellLocationInfo(aLac, aCid) { let cell = mobileConnection.data.cell; ok(cell, "location available"); - // Initial LAC/CID. Android emulator initializes both value to - // 0xffff/0xffffffff. is(cell.gsmLocationAreaCode, aLac, "data.cell.gsmLocationAreaCode"); is(cell.gsmCellId, aCid, "data.cell.gsmCellId"); is(cell.cdmaBaseStationId, -1, "data.cell.cdmaBaseStationId"); diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_state.js b/dom/mobileconnection/tests/marionette/test_mobile_data_state.js index 17eb6a43896..e7df08ebdcd 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_data_state.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_state.js @@ -13,8 +13,8 @@ const INITIAL_STATES = { relSignalStrength: 44, cell: { - gsmLocationAreaCode: 65535, - gsmCellId: 268435455, + gsmLocationAreaCode: 0, + gsmCellId: 0, cdmaBaseStationId: -1, cdmaBaseStationLatitude: -2147483648, cdmaBaseStationLongitude: -2147483648, @@ -73,8 +73,8 @@ const TEST_DATA = [{ signalStrength: -99, relSignalStrength: 44, cell: { - gsmLocationAreaCode: 65535, - gsmCellId: 268435455 + gsmLocationAreaCode: 0, + gsmCellId: 0 } } }, { @@ -88,8 +88,8 @@ const TEST_DATA = [{ signalStrength: -99, relSignalStrength: 44, cell: { - gsmLocationAreaCode: 65535, - gsmCellId: 268435455 + gsmLocationAreaCode: 0, + gsmCellId: 0 } } } diff --git a/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js b/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js index 9196a887dfc..9501bf1378a 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_voice_location.js @@ -8,8 +8,6 @@ function verifyVoiceCellLocationInfo(aLac, aCid) { let cell = mobileConnection.voice.cell; ok(cell, "location available"); - // Initial LAC/CID. Android emulator initializes both value to - // 0xffff/0xffffffff. is(cell.gsmLocationAreaCode, aLac, "check voice.cell.gsmLocationAreaCode"); is(cell.gsmCellId, aCid, "check voice.cell.gsmCellId"); is(cell.cdmaBaseStationId, -1, "check voice.cell.cdmaBaseStationId"); diff --git a/dom/mobileconnection/tests/marionette/test_mobile_voice_state.js b/dom/mobileconnection/tests/marionette/test_mobile_voice_state.js index 59f33b1e2c1..b3aa3103d63 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_voice_state.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_voice_state.js @@ -13,8 +13,8 @@ const INITIAL_STATES = { relSignalStrength: 44, cell: { - gsmLocationAreaCode: 65535, - gsmCellId: 268435455, + gsmLocationAreaCode: 0, + gsmCellId: 0, cdmaBaseStationId: -1, cdmaBaseStationLatitude: -2147483648, cdmaBaseStationLongitude: -2147483648, @@ -70,8 +70,8 @@ const TEST_DATA = [{ signalStrength: -99, relSignalStrength: 44, cell: { - gsmLocationAreaCode: 65535, - gsmCellId: 268435455 + gsmLocationAreaCode: 0, + gsmCellId: 0 } } }, { @@ -85,8 +85,8 @@ const TEST_DATA = [{ signalStrength: -99, relSignalStrength: 44, cell: { - gsmLocationAreaCode: 65535, - gsmCellId: 268435455 + gsmLocationAreaCode: 0, + gsmCellId: 0 } } } diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 4cc634fc265..25557c32a75 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -13622,7 +13622,7 @@ ICCUtilsHelperObject.prototype = { let iccInfo = RIL.iccInfo; let pnnEntry; - if (!mcc || !mnc || !lac) { + if (!mcc || !mnc || lac == null || lac < 0) { return null; } From 0904be8a4492592d07fe5761e190b1fdc25b0b07 Mon Sep 17 00:00:00 2001 From: Vicamo Yang Date: Fri, 2 May 2014 00:24:12 +0800 Subject: [PATCH 08/18] Bug 999458 - 2.d/2: add some more complex test cases for OPL/PNN matching. r=echen --- .../test_mobile_operator_names_plmnlist.js | 95 +++++++++++++++++-- 1 file changed, 85 insertions(+), 10 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js index 6a3958fb71e..4bc12a1eacc 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js @@ -4,35 +4,110 @@ MARIONETTE_TIMEOUT = 60000; MARIONETTE_HEAD_JS = "head.js"; -function check(aLongName, aShortName, aMcc, aMnc) { +const TEST_CELL_ID = 268435399; // The largest prime number that is smaller than + // 0xFFFFFFF (DEC 268435455). The next one is + // 268435459. This doesn't mean anything. ;) + // See http://primes.utm.edu/lists/small/millions/ + +function check(aLongName, aShortName, aMcc, aMnc, aLac, aCid) { let network = mobileConnection.voice.network; + log(" Got longName '" + network.longName + "', shortName '" + + network.shortName + "'"); is(network.longName, aLongName, "network.longName"); is(network.shortName, aShortName, "network.shortName"); is(network.mcc, aMcc, "network.mcc"); is(network.mnc, aMnc, "network.mnc"); + + let cell = mobileConnection.voice.cell; + + is(cell.gsmLocationAreaCode, aLac, "cell.gsmLocationAreaCode"); + is(cell.gsmCellId, aCid, "cell.gsmCellId"); } -function test(aLongName, aShortName, aMcc, aMnc, aExpectedLongName, - aExpectedShortName) { - log("Testing mcc = " + aMcc + ", mnc = " + aMnc + ":"); +function test(aLongName, aShortName, aMcc, aMnc, aLac, aCid, + aExpectedLongName, aExpectedShortName) { + log("Testing mcc = " + aMcc + ", mnc = " + aMnc + ", lac = " + aLac + ":"); - return setEmulatorOperatorNamesAndWait("home", aLongName, aShortName, - aMcc, aMnc, true, false) - .then(() => check(aExpectedLongName, aExpectedShortName, aMcc, aMnc)); + return setEmulatorGsmLocationAndWait(aLac, aCid) + .then(() => setEmulatorOperatorNamesAndWait("home", aLongName, aShortName, + aMcc, aMnc, true, false)) + // aExpectedLongName, aExpectedShortName could be empty string. + .then(() => check(aExpectedLongName == null ? aLongName : aExpectedLongName, + aExpectedShortName == null ? aShortName : aExpectedShortName, + aMcc, aMnc, aLac, aCid)); } startTestCommon(function() { + /** + * In emulator we have pre-defined 4 PNN sets: + * + * PNN 1: Full name: "Test1", Short name: "Test1" + * PNN 2: Full name: "Test2", Short name: (none) + * PNN 2: Full name: "Test3", Short name: (none) + * PNN 2: Full name: "Test4", Short name: (none) + * + * Also 4 OPL sets: + * + * MCC = 001, MNC = 01, START=0000, END=FFFE, PNN = 01, + * MCC = 001, MNC = 02, START=0001, END=0010, PNN = 02, + * MCC = 001, MNC = 03, START=0011, END=0011, PNN = 03, + * MCC = 001, MNC = 001, START=0012, END=0012, PNN = 04, + * + * See https://github.com/mozilla-b2g/platform_external_qemu/blob/master/telephony/sim_card.c#L725 + */ return getEmulatorOperatorNames() .then(function(aOperators) { let {longName: longName, shortName: shortName} = aOperators[0]; let {mcc: mcc, mnc: mnc} = mobileConnection.voice.network; + let {gsmLocationAreaCode: lac, gsmCellId: cid} = mobileConnection.voice.cell; + + // Use a cell ID that differs from current cid to ensure voicechange event + // will be triggered. + isnot(TEST_CELL_ID, cid, "A different test cell id than used currently."); + + // In following tests, we use different longName/shortName to ensure + // network name is always re-calculated in RIL worker. return Promise.resolve() - .then(() => test(longName, shortName, "123", "456", longName, shortName)) - .then(() => test(longName, shortName, "310", "070", "AT&T", "")) + // If MCC/MNC doesn't match any, report given home network name. + .then(() => test("Foo1", "Bar1", "123", "456", 0x0000, TEST_CELL_ID)) + .then(() => test("Foo2", "Bar2", "123", "456", 0x0001, TEST_CELL_ID)) + .then(() => test("Foo3", "Bar3", "123", "456", 0x0002, TEST_CELL_ID)) + .then(() => test("Foo4", "Bar4", "123", "456", 0x0010, TEST_CELL_ID)) + .then(() => test("Foo5", "Bar5", "123", "456", 0x0011, TEST_CELL_ID)) + .then(() => test("Foo6", "Bar6", "123", "456", 0xFFFE, TEST_CELL_ID)) + + // Full ranged network. Report network name from PNN. + .then(() => test("Foo1", "Bar1", "001", "01", 0x0000, TEST_CELL_ID, + "Test1", "Test1")) + .then(() => test("Foo2", "Bar2", "001", "01", 0x0001, TEST_CELL_ID, + "Test1", "Test1")) + .then(() => test("Foo3", "Bar3", "001", "01", 0xFFFE, TEST_CELL_ID, + "Test1", "Test1")) + + // Ranged network. Report network name from PNN if lac is inside the + // inclusive range 0x01..0x10. + .then(() => test("Foo1", "Bar1", "001", "02", 0x0000, TEST_CELL_ID)) + .then(() => test("Foo2", "Bar2", "001", "02", 0x0001, TEST_CELL_ID, + "Test2", "")) + .then(() => test("Foo3", "Bar3", "001", "02", 0x0002, TEST_CELL_ID, + "Test2", "")) + .then(() => test("Foo4", "Bar4", "001", "02", 0x0010, TEST_CELL_ID, + "Test2", "")) + .then(() => test("Foo5", "Bar5", "001", "02", 0xFFFE, TEST_CELL_ID)) + + // Single entry network. Report network name from PNN if lac matches. + .then(() => test("Foo1", "Bar1", "001", "03", 0x0000, TEST_CELL_ID)) + .then(() => test("Foo2", "Bar2", "001", "03", 0x0011, TEST_CELL_ID, + "Test3", "")) + .then(() => test("Foo3", "Bar3", "001", "03", 0xFFFE, TEST_CELL_ID)) + + // Test if we match MNC "01" and "001" correctly. + .then(() => test("Foo1", "Bar1", "001", "001", 0x0012, TEST_CELL_ID, + "Test4", "")) // Reset back to initial values. - .then(() => test(longName, shortName, mcc, mnc, longName, shortName)); + .then(() => test(longName, shortName, mcc, mnc, lac, cid)); }); }); From 7d1a2a2593970343b29d30db01ff8fcadfb3d168 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 10:30:55 -0700 Subject: [PATCH 09/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c55d4ca164d0 Author: Kevin Grandon Desc: Merge pull request #18846 from KevinGrandon/bug_971543_system2_instantiable_rocketbar Bug 971543 - [System2] Make Rocketbar instantiable ======== https://hg.mozilla.org/integration/gaia-central/rev/50c83e7e3821 Author: Kevin Grandon Desc: Bug 971543 - [System2] Make Rocketbar instantiable r=benfrancis --- 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 7a59dddcc4b..065a4d69966 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "5b7dbc28c71bd5e8da989df05701e279c5ec8fe4", + "revision": "c55d4ca164d059cc7c6288e18939ebeebaddb0aa", "repo_path": "/integration/gaia-central" } From 68b0dff0f7ab79a7f771e0f2c1a916ef89322794 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 10:36:20 -0700 Subject: [PATCH 10/18] Bumping manifests a=b2g-bump --- 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/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fa72d0a4a40..ebd4a7f9281 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 ff92829552a..5d35f4840bf 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 681680d0332..3c0573871da 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 fa72d0a4a40..ebd4a7f9281 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 579d7e647a9..25d61a08664 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e5c9600d5e1..a2e5f3b7bab 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 c0a84bf7898..5cb567ffa2a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 5ca2718c416..35f6dd28e7e 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 33f97c30c10..7545033e5b2 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 512d103e0cd..45b25785e9a 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index eaf0c534119..af5fe87235e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 279680efc2247726b05793357a619a62b144df8d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 12:30:53 -0700 Subject: [PATCH 11/18] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3260904fd1bf Author: Kevin Grandon Desc: Bug 993652 - Disable intermittent failing test, Places tests Search for previously visited URL --- 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 065a4d69966..2f9097b8464 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "c55d4ca164d059cc7c6288e18939ebeebaddb0aa", + "revision": "3260904fd1bfec40885af0b85d6be46fb5902af2", "repo_path": "/integration/gaia-central" } From 69a726e3339348b85e349437d4de6ff2e2707067 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 12:32:57 -0700 Subject: [PATCH 12/18] Bumping manifests a=b2g-bump --- 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/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ebd4a7f9281..fd46e7a17ae 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 5d35f4840bf..1d0acb81010 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 3c0573871da..3d76e62abe9 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 ebd4a7f9281..fd46e7a17ae 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 25d61a08664..80309857e26 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a2e5f3b7bab..a8d41596325 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 5cb567ffa2a..072c295b119 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 35f6dd28e7e..a209c26b2e6 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 7545033e5b2..82483fa852c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 45b25785e9a..6c40fb8bb75 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index af5fe87235e..08659b68ae2 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 686153368c74974464fdf22efd4c73013da577da Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 14:15:48 -0700 Subject: [PATCH 13/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e67a9ece551b Author: Kevin Grandon Desc: Merge pull request #18869 from KevinGrandon/bug_985237_disable_failing_pinyin_test Bug 985237 - Disable failing test, keyboard/test/unit/jspinyin_test.js | jspinyin deactivate ======== https://hg.mozilla.org/integration/gaia-central/rev/671be39dd2ab Author: Kevin Grandon Desc: Bug 985237 - Disable failing test, keyboard/test/unit/jspinyin_test.js | jspinyin deactivate --- 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 2f9097b8464..b0e9a191d57 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3260904fd1bfec40885af0b85d6be46fb5902af2", + "revision": "e67a9ece551b687c2f49b8844784cf777ddd55ba", "repo_path": "/integration/gaia-central" } From 20da84132d03ad8d4e77a497fc4c846a2432491f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 14:21:17 -0700 Subject: [PATCH 14/18] Bumping manifests a=b2g-bump --- 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/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fd46e7a17ae..6ae9649a031 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 1d0acb81010..e11d41fc077 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 3d76e62abe9..71f09e782ea 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 fd46e7a17ae..6ae9649a031 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 80309857e26..8ac240a0989 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a8d41596325..e449a322c08 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 072c295b119..c6438aaee94 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a209c26b2e6..94f4d506c4a 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 82483fa852c..fa76bcc4a1e 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 6c40fb8bb75..1331cb70366 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 08659b68ae2..19fb45273d7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 38171a0fb6c08a57acadafa0246fa622376ca857 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 14:45:52 -0700 Subject: [PATCH 15/18] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/07a9b9b364c4 Author: Andrew Sutherland Desc: Merge pull request #18707 from Archaeopteryx/email-stringRemoval Bug 1001817 - [email] remove unused localization strings from Firefox OS 2.0. r=jrburke, r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/56ebe71c017c Author: Sebastian Hengst Desc: Bug 1001817 - [email] remove unused localization strings from Firefox OS 2.0 --- 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 b0e9a191d57..e3937885a9d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e67a9ece551b687c2f49b8844784cf777ddd55ba", + "revision": "07a9b9b364c492901c818ad6db55e0ab355e931e", "repo_path": "/integration/gaia-central" } From 533a0054cd533a0e3ceb9231228fb619db14b6c4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 14:51:22 -0700 Subject: [PATCH 16/18] Bumping manifests a=b2g-bump --- 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/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6ae9649a031..9ff84dca3bd 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 e11d41fc077..a2694e01784 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 71f09e782ea..0531857fa31 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 6ae9649a031..9ff84dca3bd 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 8ac240a0989..a4285aa5b44 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e449a322c08..2e93e452cf6 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 c6438aaee94..cf849843ec7 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 94f4d506c4a..5ea9a64943a 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index fa76bcc4a1e..f991e233da7 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 1331cb70366..0de9bdfd24a 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 19fb45273d7..18ef6555681 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8441746536cba1798a1783ecdeeba23b0f2773b1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 16:21:01 -0700 Subject: [PATCH 17/18] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/689e41080c6c Author: Kevin Grandon Desc: Bug 985237 - Disable jspinyin_test from TBPL --- 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 e3937885a9d..5b353d84f6f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "07a9b9b364c492901c818ad6db55e0ab355e931e", + "revision": "689e41080c6c21f0d2b51363304776c70967c9c5", "repo_path": "/integration/gaia-central" } From 855e5701062e2c21c4c351a302447b3b0fd8b19e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 1 May 2014 16:22:59 -0700 Subject: [PATCH 18/18] Bumping manifests a=b2g-bump --- 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/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9ff84dca3bd..e9b682e1aca 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 a2694e01784..04556758b5c 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 0531857fa31..a265e04b537 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 9ff84dca3bd..e9b682e1aca 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index a4285aa5b44..1a809ccb390 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 2e93e452cf6..79719fdab81 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 cf849843ec7..846269b92e4 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 5ea9a64943a..22b114744c0 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index f991e233da7..804ad8e4845 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 0de9bdfd24a..77c8ca6e939 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 18ef6555681..4c640c557b3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +