From 0e4c666662d6944ab89e2cf5799bd6cdd09f5ad2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 03:21:00 -0700 Subject: [PATCH 01/38] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ed21b3f36335 Author: steveck-chung Desc: Merge pull request #17878 from steveck-chung/FM-2.25X Bug 983077 - [MADAI][FMRadio] @2.25x assets update for FMRadio. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/0a5173dcfc3a Author: Steve Chung Desc: Bug 983077 - [MADAI][FMRadio] @2.25x assets update for FMRadio ======== https://hg.mozilla.org/integration/gaia-central/rev/3fc0920f1e50 Author: Florin Strugariu Desc: Merge pull request #17879 from AndreiH/bug990985 Bug 990985 - [master][v1.4] Let's xfail test_settings_airplane_mode.Test... ======== https://hg.mozilla.org/integration/gaia-central/rev/825e88e7b440 Author: Andrei Hutusoru Desc: Bug 990985 - [master][v1.4] Let's xfail test_settings_airplane_mode.TestAirplaneMode --- 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 7db30e654796..a5a10b590c21 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "c23b496987e1e356c1cf7cc848c69511f6db041a", + "revision": "ed21b3f363356c5ee7817e42505b48101d312277", "repo_path": "/integration/gaia-central" } From f1860cf10057bbd76aefa520f9b7887f96ac8f9d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 03:26:10 -0700 Subject: [PATCH 02/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f97715d1fd21..2d4908b1a95c 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 35d36383298a..e6735ced9614 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 690528d18963..1bd2a497edc3 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 f97715d1fd21..2d4908b1a95c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c25a6b353ffd..159fa214bd22 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 591534591755..8114a003e7b4 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 3f4931261228..2f8555ae6ad9 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 500bb6e9867f..58081f0d7611 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 ea9b47c0bde2..5f7310608d78 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 707ac8116dc5..50091b5ff796 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7fb8fb3a400de30449daf51047a5236568787f79 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 05:21:02 -0700 Subject: [PATCH 03/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/148a78c85200 Author: Florin Strugariu Desc: Merge pull request #17887 from askeing/991010 Bug 991010 - Fix intermittent failure of test_email_XXX.py ======== https://hg.mozilla.org/integration/gaia-central/rev/6bbfc622ea46 Author: askeing Desc: Bug 991010 - Fix intermittent failure of test_email_XXX.py --- 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 a5a10b590c21..331046ac3e70 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ed21b3f363356c5ee7817e42505b48101d312277", + "revision": "148a78c852008407c8ce071a1ccd8653562be602", "repo_path": "/integration/gaia-central" } From 6bb1bdcc919d64b302a2c82d2645242d055fbfe9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 05:26:09 -0700 Subject: [PATCH 04/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2d4908b1a95c..1f1d49d92e64 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 e6735ced9614..bdd4bdb6a05e 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 1bd2a497edc3..916b6e01847e 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 2d4908b1a95c..1f1d49d92e64 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 159fa214bd22..21b957a17be8 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 8114a003e7b4..5adccf54c4e8 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 2f8555ae6ad9..af833f525fe6 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 58081f0d7611..5d58a9d2256f 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 5f7310608d78..8382780095dc 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 50091b5ff796..928dcef2ab0a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From ce3a6d74e2c67482afd194066a1283241fec56a1 Mon Sep 17 00:00:00 2001 From: Jamin Liu Date: Wed, 2 Apr 2014 08:51:46 -0400 Subject: [PATCH 05/38] Bug 860698 - B2G Bluetooth: Add a test case for discover remote device through BluetoothAdapter. r=vyang, r=echou --- dom/bluetooth/tests/marionette/head.js | 132 ++++++++++++++++++ dom/bluetooth/tests/marionette/manifest.ini | 1 + .../test_dom_BluetoothAdapter_discovery.js | 47 +++++++ 3 files changed, 180 insertions(+) create mode 100644 dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js diff --git a/dom/bluetooth/tests/marionette/head.js b/dom/bluetooth/tests/marionette/head.js index f479922e8834..ae3a46fb1d34 100644 --- a/dom/bluetooth/tests/marionette/head.js +++ b/dom/bluetooth/tests/marionette/head.js @@ -35,6 +35,9 @@ const BDADDR_ANY = "00:00:00:00:00:00"; const BDADDR_ALL = "ff:ff:ff:ff:ff:ff"; const BDADDR_LOCAL = "ff:ff:ff:00:00:00"; +// A user friendly name for remote BT device. +const REMOTE_DEVICE_NAME = "Remote BT Device"; + let Promise = SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; @@ -77,6 +80,70 @@ function runEmulatorCmdSafe(aCommand) { return deferred.promise; } +/** + * Add a Bluetooth remote device to scatternet and set its properties. + * + * Use QEMU command 'bt remote add' to add a virtual Bluetooth remote + * and set its properties by setEmulatorDeviceProperty(). + * + * Fulfill params: + * result -- bluetooth address of the remote device. + * Reject params: (none) + * + * @param aProperies + * A javascript object with zero or several properties for initializing + * the remote device. By now, the properies could be 'name' or + * 'discoverable'. It valid to put a null object or a javascript object + * which don't have any properies. + * + * @return A promise object. + */ +function addEmulatorRemoteDevice(aProperties) { + let address; + let promise = runEmulatorCmdSafe("bt remote add") + .then(function(aResults) { + address = aResults[0].toUpperCase(); + }); + + for (let key in aProperties) { + let value = aProperties[key]; + let propertyName = key; + promise = promise.then(function() { + return setEmulatorDeviceProperty(address, propertyName, value); + }); + } + + return promise.then(function() { + return address; + }); +} + +/** + * Remove Bluetooth remote devices in scatternet. + * + * Use QEMU command 'bt remote remove ' to remove a specific virtual + * Bluetooth remote device in scatternet or remove them all by QEMU command + * 'bt remote remove BDADDR_ALL'. + * + * @param aAddress + * The string of Bluetooth address with format xx:xx:xx:xx:xx:xx. + * + * Fulfill params: + * result -- an array of emulator response lines. + * Reject params: (none) + * + * @return A promise object. + */ +function removeEmulatorRemoteDevice(aAddress) { + let cmd = "bt remote remove " + aAddress; + return runEmulatorCmdSafe(cmd) + .then(function(aResults) { + // 'bt remote remove ' returns a list of removed device one at a line. + // The last item is "OK". + return aResults.slice(0, -1); + }); +} + /** * Set a property for a Bluetooth device. * @@ -126,6 +193,71 @@ function getEmulatorDeviceProperty(aAddress, aPropertyName) { }); } +/** + * Start dicovering Bluetooth devices. + * + * Allows the device's adapter to start seeking for remote devices. + * + * Fulfill params: (none) + * Reject params: a DOMError + * + * @param aAdapter + * A BluetoothAdapter which is used to interact with local BT dev + * + * @return A deferred promise. + */ +function startDiscovery(aAdapter) { + let deferred = Promise.defer(); + + let request = aAdapter.startDiscovery(); + request.onsuccess = function () { + log(" Start discovery - Success"); + // TODO (bug 892207): Make Bluetooth APIs available for 3rd party apps. + // Currently, discovering state wouldn't change immediately here. + // We would turn on this check when the redesigned API are landed. + // is(aAdapter.discovering, true, "BluetoothAdapter.discovering"); + deferred.resolve(); + } + request.onerror = function (aEvent) { + ok(false, "Start discovery - Fail"); + deferred.reject(aEvent.target.error); + } + + return deferred.promise; +} + +/** + * Stop dicovering Bluetooth devices. + * + * Allows the device's adapter to stop seeking for remote devices. + * + * Fulfill params: (none) + * Reject params: a DOMError + * + * @param aAdapter + * A BluetoothAdapter which is used to interact with local BT device. + * + * @return A deferred promise. + */ +function stopDiscovery(aAdapter) { + let deferred = Promise.defer(); + + let request = aAdapter.stopDiscovery(); + request.onsuccess = function () { + log(" Stop discovery - Success"); + // TODO (bug 892207): Make Bluetooth APIs available for 3rd party apps. + // Currently, discovering state wouldn't change immediately here. + // We would turn on this check when the redesigned API are landed. + // is(aAdapter.discovering, false, "BluetoothAdapter.discovering"); + deferred.resolve(); + } + request.onerror = function (aEvent) { + ok(false, "Stop discovery - Fail"); + deferred.reject(aEvent.target.error); + } + return deferred.promise; +} + /** * Get mozSettings value specified by @aKey. * diff --git a/dom/bluetooth/tests/marionette/manifest.ini b/dom/bluetooth/tests/marionette/manifest.ini index eeb53be998bf..64819b7b9ce0 100644 --- a/dom/bluetooth/tests/marionette/manifest.ini +++ b/dom/bluetooth/tests/marionette/manifest.ini @@ -7,3 +7,4 @@ qemu = true [test_dom_BluetoothManager_adapteradded.js] [test_dom_BluetoothAdapter_setters.js] [test_dom_BluetoothAdapter_getters.js] +[test_dom_BluetoothAdapter_discovery.js] diff --git a/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js new file mode 100644 index 000000000000..97ef81eb8e14 --- /dev/null +++ b/dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js @@ -0,0 +1,47 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * vim: sw=2 ts=2 sts=2 et filetype=javascript + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/////////////////////////////////////////////////////////////////////////////// +// Test Purpose: +// To verify that discovery process of BluetoothAdapter is correct. +// Use B2G emulator commands to add/remote remote devices to simulate +// discovering behavior. +// +// Test Coverage: +// - BluetoothAdapter.startDiscovery() +// - BluetoothAdapter.stopDiscovery() +// - BluetoothAdapter.ondevicefound() +// - BluetoothAdapter.discovering [Temporarily turned off until BT API update] +// +/////////////////////////////////////////////////////////////////////////////// + +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = 'head.js'; + +startBluetoothTest(true, function testCaseMain(aAdapter) { + log("Testing the discovery process of BluetoothAdapter ..."); + + // The properties of remote device. + let theProperties = { + "name": REMOTE_DEVICE_NAME, + "discoverable": true + }; + + return Promise.resolve() + .then(() => removeEmulatorRemoteDevice(BDADDR_ALL)) + .then(() => addEmulatorRemoteDevice(/*theProperties*/ null)) + .then(function(aRemoteAddress) { + let promises = []; + promises.push(waitForAdapterEvent(aAdapter, "devicefound")); + promises.push(startDiscovery(aAdapter)); + return Promise.all(promises) + .then(function(aResults) { + is(aResults[0].device.address, aRemoteAddress, "BluetoothDevice.address"); + }); + }) + .then(() => stopDiscovery(aAdapter)) + .then(() => removeEmulatorRemoteDevice(BDADDR_ALL)); +}); From a6871c3c19ae3c6d404d98c628ed358c83cec7ea Mon Sep 17 00:00:00 2001 From: Jan Jongboom Date: Wed, 2 Apr 2014 08:51:46 -0400 Subject: [PATCH 06/38] Bug 987549 - Wait until BrowserElement child scripts have been loaded before dispatching inputMethod setActive request. r=yxl --- dom/browser-element/BrowserElementChild.js | 11 +++--- dom/browser-element/BrowserElementParent.jsm | 38 ++++++++++++++------ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dom/browser-element/BrowserElementChild.js b/dom/browser-element/BrowserElementChild.js index ecb8fc65bb3f..aa06587c95fa 100644 --- a/dom/browser-element/BrowserElementChild.js +++ b/dom/browser-element/BrowserElementChild.js @@ -15,12 +15,6 @@ function debug(msg) { // mozbrowser API clients. docShell.isActive = true; -let infos = sendSyncMessage('browser-element-api:call', - { 'msg_name': 'hello' })[0]; -docShell.QueryInterface(Ci.nsIDocShellTreeItem).name = infos.name; -docShell.setFullscreenAllowed(infos.fullscreenAllowed); - - function parentDocShell(docshell) { if (!docshell) { return null; @@ -57,3 +51,8 @@ if (!('BrowserElementIsPreloaded' in this)) { } var BrowserElementIsReady = true; + +let infos = sendSyncMessage('browser-element-api:call', + { 'msg_name': 'hello' })[0]; +docShell.QueryInterface(Ci.nsIDocShellTreeItem).name = infos.name; +docShell.setFullscreenAllowed(infos.fullscreenAllowed); diff --git a/dom/browser-element/BrowserElementParent.jsm b/dom/browser-element/BrowserElementParent.jsm index 9cffe972fbb6..e24117ac6177 100644 --- a/dom/browser-element/BrowserElementParent.jsm +++ b/dom/browser-element/BrowserElementParent.jsm @@ -366,9 +366,11 @@ BrowserElementParent.prototype = { return true; }, - _recvHello: function(data) { + _recvHello: function() { debug("recvHello"); + this._ready = true; + // Inform our child if our owner element's document is invisible. Note // that we must do so here, rather than in the BrowserElementParent // constructor, because the BrowserElementChild may not be initialized when @@ -382,7 +384,7 @@ BrowserElementParent.prototype = { fullscreenAllowed: this._frameElement.hasAttribute('allowfullscreen') || this._frameElement.hasAttribute('mozallowfullscreen') - } + }; }, _fireCtxMenuEvent: function(data) { @@ -724,15 +726,31 @@ BrowserElementParent.prototype = { } else { let reqOld = XPCNativeWrapper.unwrap(activeInputFrame) .setInputMethodActive(false); - reqOld.onsuccess = function() { - activeInputFrame = null; - this._sendSetInputMethodActiveDOMRequest(req, isActive); + + // We wan't to continue regardless whether this req succeeded + reqOld.onsuccess = reqOld.onerror = function() { + let setActive = function() { + activeInputFrame = null; + this._sendSetInputMethodActiveDOMRequest(req, isActive); + }.bind(this); + + if (this._ready) { + setActive(); + return; + } + + // Wait for the hello event from BrowserElementChild + let onReady = function(aMsg) { + if (this._isAlive() && (aMsg.data.msg_name === 'hello')) { + setActive(); + + this._mm.removeMessageListener('browser-element-api:call', + onReady); + } + }.bind(this); + + this._mm.addMessageListener('browser-element-api:call', onReady); }.bind(this); - reqOld.onerror = function() { - Services.DOMRequest.fireErrorAsync(req, - 'Failed to deactivate the old input method: ' + - reqOld.error + '.'); - }; } } else { this._sendSetInputMethodActiveDOMRequest(req, isActive); From 9fefdce0485799de86145317977809fc76b60441 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Wed, 2 Apr 2014 08:51:46 -0400 Subject: [PATCH 07/38] Bug 990356 - Part 1: Remove lazy init of |mTimer| since we need one for most of the case. r=cpearce --- content/media/MediaDecoderStateMachine.cpp | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp index 542aa4e86d16..ec1b63f4f844 100644 --- a/content/media/MediaDecoderStateMachine.cpp +++ b/content/media/MediaDecoderStateMachine.cpp @@ -1047,6 +1047,12 @@ nsresult MediaDecoderStateMachine::Init(MediaDecoderStateMachine* aCloneDonor) mStateMachineThreadPool = stateMachinePool; + nsresult rv; + mTimer = do_CreateInstance("@mozilla.org/timer;1", &rv); + NS_ENSURE_SUCCESS(rv, rv); + rv = mTimer->SetTarget(GetStateMachineThread()); + NS_ENSURE_SUCCESS(rv, rv); + return mReader->Init(cloneReader); } @@ -2785,11 +2791,9 @@ nsresult MediaDecoderStateMachine::ScheduleStateMachine(int64_t aUsecs) { // or have an event dispatched to run the state machine. return NS_OK; } - if (mTimer) { - // We've been asked to schedule a timer to run before an existing timer. - // Cancel the existing timer. - mTimer->Cancel(); - } + // We've been asked to schedule a timer to run before an existing timer. + // Cancel the existing timer. + mTimer->Cancel(); } uint32_t ms = static_cast((aUsecs / USECS_PER_MS) & 0xFFFFFFFF); @@ -2821,18 +2825,12 @@ nsresult MediaDecoderStateMachine::ScheduleStateMachine(int64_t aUsecs) { mTimeout = timeout; - nsresult res; - if (!mTimer) { - mTimer = do_CreateInstance("@mozilla.org/timer;1", &res); - if (NS_FAILED(res)) return res; - mTimer->SetTarget(GetStateMachineThread()); - } - - res = mTimer->InitWithFuncCallback(mozilla::TimeoutExpired, - this, - ms, - nsITimer::TYPE_ONE_SHOT); - return res; + nsresult rv = mTimer->InitWithFuncCallback(mozilla::TimeoutExpired, + this, + ms, + nsITimer::TYPE_ONE_SHOT); + NS_ENSURE_SUCCESS(rv, rv); + return NS_OK; } bool MediaDecoderStateMachine::OnDecodeThread() const From 7cb5d740eadb3697361147cd28170c81d2f3a9bc Mon Sep 17 00:00:00 2001 From: JW Wang Date: Wed, 2 Apr 2014 08:51:47 -0400 Subject: [PATCH 08/38] Bug 990356 - Part 2: Only one way to dispatch state machine (using a timer) tasks and remove unused variables. r=cpearce --- content/media/MediaDecoderStateMachine.cpp | 82 ++++------------------ content/media/MediaDecoderStateMachine.h | 27 ++----- 2 files changed, 22 insertions(+), 87 deletions(-) diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp index ec1b63f4f844..1a633a12fcf3 100644 --- a/content/media/MediaDecoderStateMachine.cpp +++ b/content/media/MediaDecoderStateMachine.cpp @@ -160,6 +160,7 @@ MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder, bool aRealTime) : mDecoder(aDecoder), mState(DECODER_STATE_DECODING_METADATA), + mInRunningStateMachine(false), mSyncPointInMediaStream(-1), mSyncPointInDecodedStream(-1), mResetPlayStartTime(false), @@ -191,10 +192,7 @@ MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder, mDispatchedEventToDecode(false), mStopAudioThread(true), mQuickBuffering(false), - mIsRunning(false), - mRunAgain(false), mMinimizePreroll(false), - mDispatchedRunEvent(false), mDecodeThreadWaiting(false), mRealTime(aRealTime), mEventManager(aDecoder), @@ -2708,40 +2706,26 @@ nsresult MediaDecoderStateMachine::GetBuffered(dom::TimeRanges* aBuffered) { nsresult MediaDecoderStateMachine::Run() { - ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); - NS_ASSERTION(OnStateMachineThread(), "Should be on state machine thread."); - - return CallRunStateMachine(); + // only allowing scheduling with timer task + MOZ_ASSERT(false); + return NS_ERROR_FAILURE; } nsresult MediaDecoderStateMachine::CallRunStateMachine() { AssertCurrentThreadInMonitor(); NS_ASSERTION(OnStateMachineThread(), "Should be on state machine thread."); - // This will be set to true by ScheduleStateMachine() if it's called - // while we're in RunStateMachine(). - mRunAgain = false; - - // Set to true whenever we dispatch an event to run this state machine. - // This flag prevents us from dispatching - mDispatchedRunEvent = false; // If audio is being captured, stop the audio thread if it's running if (mAudioCaptured) { StopAudioThread(); } + MOZ_ASSERT(!mInRunningStateMachine, "State machine cycles must run in sequence!"); mTimeout = TimeStamp(); - - mIsRunning = true; + mInRunningStateMachine = true; nsresult res = RunStateMachine(); - mIsRunning = false; - - if (mRunAgain && !mDispatchedRunEvent) { - mDispatchedRunEvent = true; - return GetStateMachineThread()->Dispatch(this, NS_DISPATCH_NORMAL); - } - + mInRunningStateMachine = false; return res; } @@ -2756,16 +2740,7 @@ void MediaDecoderStateMachine::TimeoutExpired() { ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); NS_ASSERTION(OnStateMachineThread(), "Must be on state machine thread"); - if (mIsRunning) { - mRunAgain = true; - } else if (!mDispatchedRunEvent) { - // We don't have an event dispatched to run the state machine, so we - // can just run it from here. - CallRunStateMachine(); - } - // Otherwise, an event has already been dispatched to run the state machine - // as soon as possible. Nothing else needed to do, the state machine is - // going to run anyway. + CallRunStateMachine(); } void MediaDecoderStateMachine::ScheduleStateMachineWithLockAndWakeDecoder() { @@ -2785,46 +2760,19 @@ nsresult MediaDecoderStateMachine::ScheduleStateMachine(int64_t aUsecs) { aUsecs = std::max(aUsecs, 0); TimeStamp timeout = TimeStamp::Now() + UsecsToDuration(aUsecs); - if (!mTimeout.IsNull()) { - if (timeout >= mTimeout) { - // We've already scheduled a timer set to expire at or before this time, - // or have an event dispatched to run the state machine. - return NS_OK; - } - // We've been asked to schedule a timer to run before an existing timer. - // Cancel the existing timer. - mTimer->Cancel(); + if (!mTimeout.IsNull() && timeout >= mTimeout) { + // We've already scheduled a timer set to expire at or before this time, + // or have an event dispatched to run the state machine. + return NS_OK; } uint32_t ms = static_cast((aUsecs / USECS_PER_MS) & 0xFFFFFFFF); - if (mRealTime && ms > 40) + if (mRealTime && ms > 40) { ms = 40; - if (ms == 0) { - if (mIsRunning) { - // We're currently running this state machine on the state machine - // thread. Signal it to run again once it finishes its current cycle. - mRunAgain = true; - return NS_OK; - } else if (!mDispatchedRunEvent) { - // We're not currently running this state machine on the state machine - // thread. Dispatch an event to run one cycle of the state machine. - mDispatchedRunEvent = true; - return GetStateMachineThread()->Dispatch(this, NS_DISPATCH_NORMAL); - } - // We're not currently running this state machine on the state machine - // thread, but something has already dispatched an event to run it again, - // so just exit; it's going to run real soon. - return NS_OK; } - - // Since there is already a pending task that will run immediately, - // we don't need to schedule a timer task. - if (mRunAgain) { - return NS_OK; - } - mTimeout = timeout; - + // Cancel existing timer if any since we are going to schedule a new one. + mTimer->Cancel(); nsresult rv = mTimer->InitWithFuncCallback(mozilla::TimeoutExpired, this, ms, diff --git a/content/media/MediaDecoderStateMachine.h b/content/media/MediaDecoderStateMachine.h index ccfdc3538800..c578f298dcdb 100644 --- a/content/media/MediaDecoderStateMachine.h +++ b/content/media/MediaDecoderStateMachine.h @@ -646,7 +646,7 @@ private: bool IsStateMachineScheduled() const { AssertCurrentThreadInMonitor(); - return !mTimeout.IsNull() || mRunAgain; + return !mTimeout.IsNull(); } // Returns true if we're not playing and the decode thread has filled its @@ -682,15 +682,17 @@ private: RefPtr mStateMachineThreadPool; - // Timer to call the state machine Run() method. Used by + // Timer to run the state machine cycles. Used by // ScheduleStateMachine(). Access protected by decoder monitor. nsCOMPtr mTimer; - // Timestamp at which the next state machine Run() method will be called. - // If this is non-null, a call to Run() is scheduled, either by a timer, - // or via an event. Access protected by decoder monitor. + // Timestamp at which the next state machine cycle will run. + // Access protected by decoder monitor. TimeStamp mTimeout; + // Used to check if there are state machine cycles are running in sequence. + DebugOnly mInRunningStateMachine; + // The time that playback started from the system clock. This is used for // timing the presentation of video frames when there's no audio. // Accessed only via the state machine thread. @@ -920,14 +922,6 @@ private: // Synchronised via decoder monitor. bool mQuickBuffering; - // True if the shared state machine thread is currently running this - // state machine. - bool mIsRunning; - - // True if we should run the state machine again once the current - // state machine run has finished. - bool mRunAgain; - // True if we should not decode/preroll unnecessary samples, unless we're // played. "Prerolling" in this context refers to when we decode and // buffer decoded samples in advance of when they're needed for playback. @@ -940,13 +934,6 @@ private: // memory and CPU overhead. bool mMinimizePreroll; - // True if we've dispatched an event to run the state machine. It's - // imperative that we don't dispatch multiple events to run the state - // machine at the same time, as our code assume all events are synchronous. - // If we dispatch multiple events, the second event can run while the - // first is shutting down a thread, causing inconsistent state. - bool mDispatchedRunEvent; - // True if the decode thread has gone filled its buffers and is now // waiting to be awakened before it continues decoding. Synchronized // by the decoder monitor. From 0ec83ca01e6b4484cac5f4ea794769693050a557 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Wed, 2 Apr 2014 08:51:47 -0400 Subject: [PATCH 09/38] Bug 990356 - Part 3: Remove nsRunnable base class from MediaDecoderStateMachine. r=cpearce --- content/media/MediaDecoderStateMachine.cpp | 7 ------- content/media/MediaDecoderStateMachine.h | 6 ++---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp index 1a633a12fcf3..186e009f3f37 100644 --- a/content/media/MediaDecoderStateMachine.cpp +++ b/content/media/MediaDecoderStateMachine.cpp @@ -2704,13 +2704,6 @@ nsresult MediaDecoderStateMachine::GetBuffered(dom::TimeRanges* aBuffered) { return res; } -nsresult MediaDecoderStateMachine::Run() -{ - // only allowing scheduling with timer task - MOZ_ASSERT(false); - return NS_ERROR_FAILURE; -} - nsresult MediaDecoderStateMachine::CallRunStateMachine() { AssertCurrentThreadInMonitor(); diff --git a/content/media/MediaDecoderStateMachine.h b/content/media/MediaDecoderStateMachine.h index c578f298dcdb..0d5917fa3da2 100644 --- a/content/media/MediaDecoderStateMachine.h +++ b/content/media/MediaDecoderStateMachine.h @@ -113,8 +113,9 @@ class SharedThreadPool; See MediaDecoder.h for more details. */ -class MediaDecoderStateMachine : public nsRunnable +class MediaDecoderStateMachine { + NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaDecoderStateMachine) public: typedef MediaDecoder::DecodedStreamData DecodedStreamData; MediaDecoderStateMachine(MediaDecoder* aDecoder, @@ -227,9 +228,6 @@ public: // the main thread. void StartBuffering(); - // State machine thread run function. Defers to RunStateMachine(). - NS_IMETHOD Run() MOZ_OVERRIDE; - // This is called on the state machine thread and audio thread. // The decoder monitor must be obtained before calling this. bool HasAudio() const { From cb8705a6ba0365cf0a954e82a837071fe504dd2d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 05:57:51 -0700 Subject: [PATCH 10/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/22bcbfd9b22b Author: Kevin Grandon Desc: Merge pull request #17875 from evanxd/bug-990448 Bug 990448 - [Calendar] JSHint fixes for remaining files ======== https://hg.mozilla.org/integration/gaia-central/rev/667c28607872 Author: Evan Xd Desc: Bug 990448 - JSHint fixes for the controllers and models folders. --- 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 331046ac3e70..4732eca36a26 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "148a78c852008407c8ce071a1ccd8653562be602", + "revision": "22bcbfd9b22bb0f432376c771d189954756b334e", "repo_path": "/integration/gaia-central" } From 61cc211ca0c51c673eea3427f866e5a16d686012 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 05:58:02 -0700 Subject: [PATCH 11/38] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 4 ++-- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/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 | 4 ++-- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1f1d49d92e64..113128e9b11d 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 bdd4bdb6a05e..7f7915daf49f 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -12,12 +12,12 @@ - + - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 916b6e01847e..9836a5a40d6d 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 1f1d49d92e64..113128e9b11d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 21b957a17be8..e621ea7f469a 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 5adccf54c4e8..185b70c65003 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 af833f525fe6..197ab75cdde2 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 5d58a9d2256f..e095e82debc4 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 8382780095dc..ce657c906b11 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -12,12 +12,12 @@ - + - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 928dcef2ab0a..707342e1eebf 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 78d489cee4f0785e1d85a73bcfee4b9edfde3efa Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:01:07 -0700 Subject: [PATCH 12/38] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/20d2e116f568 Author: Fabien Cazenave Desc: Merge pull request #17338 from anefzaoui/RTL-Switches Bug 985165 - (gaia-rtl) Reverse Switches for Right To Left languages, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/0b21e59ef47e Author: anefzaoui Desc: Reversed BB Switches for RTL ======== https://hg.mozilla.org/integration/gaia-central/rev/d5bcb38bdf98 Author: Ben Francis Desc: Merge pull request #17718 from gabrielesvelto/bug-985369-improve-url-input Bug 985369 - Improve URL input r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/fc67621b6c8e Author: Gabriele Svelto Desc: Bug 985369 - Clean up all linting issues ======== https://hg.mozilla.org/integration/gaia-central/rev/3f81a49f648a Author: Gabriele Svelto Desc: Bug 985369 - Drop updates to the suggestions that have already been superseded --- 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 4732eca36a26..0ba68f619753 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "22bcbfd9b22bb0f432376c771d189954756b334e", + "revision": "20d2e116f5689a07f4b39b8432dc5210f66eb039", "repo_path": "/integration/gaia-central" } From 2d89ee1bee68b17721ef159a6ea4a8b8e42b87ab Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:06:14 -0700 Subject: [PATCH 13/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 113128e9b11d..d0cf2ec7b0d8 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 7f7915daf49f..d66ba9aae968 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 9836a5a40d6d..e0ee72d67a1b 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 113128e9b11d..d0cf2ec7b0d8 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e621ea7f469a..f9c2f8469bba 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 185b70c65003..456c6f2ec04d 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 197ab75cdde2..e3fd1b7389f1 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 e095e82debc4..d9c32e3777b7 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 ce657c906b11..52d7bed0bf37 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 707342e1eebf..e2e3a80a50df 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 76a477ea370d78b52a56da2057240053313e9463 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:16:06 -0700 Subject: [PATCH 14/38] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d3e863e307c4 Author: Kevin Grandon Desc: Bug 985369 - Follow-up, fix linter issues r=me --- 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 0ba68f619753..a46f33527b97 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "20d2e116f5689a07f4b39b8432dc5210f66eb039", + "revision": "d3e863e307c40b6eb2829835e41c772caf8a4cb0", "repo_path": "/integration/gaia-central" } From cfc43aa10115501f1464dd56e2ee071105abf6fd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:21:25 -0700 Subject: [PATCH 15/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d0cf2ec7b0d8..6add84ccfeb0 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 d66ba9aae968..51852bbaefbd 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 e0ee72d67a1b..533260ec2414 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 d0cf2ec7b0d8..6add84ccfeb0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f9c2f8469bba..5e23b4aeb366 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 456c6f2ec04d..8ab742355535 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 e3fd1b7389f1..95b2d25f2cea 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 d9c32e3777b7..7b3569c0b02d 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 52d7bed0bf37..de20593fd62e 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 e2e3a80a50df..28d093aac3f8 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4645f8bd8dc1dbb4049625ee5ff902472fddac64 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:41:11 -0700 Subject: [PATCH 16/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a6cc73a4ec36 Author: Jan Jongboom Desc: Merge pull request #17336 from comoyo/bug984407_v2 Bug 984407 - Reflows on focus/blur in e.me. r=ran ======== https://hg.mozilla.org/integration/gaia-central/rev/018645df2397 Author: Jan Jongboom Desc: Bug 984407 - Reflows on focus/blur in e.me Dont reflow when toggling evme-loading-from-input. Compared the visuals of before and after in the dock and they are exactly the same. Stop reflowing on evme-keyboard-visible Remove footer reflow on window resize Remove reflows (unless required) in everything.me Scroll plugin Some small reflows in helper.css code Dont let the everything.me container steal pointer events from the homescreen if it's not active --- 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 a46f33527b97..584851c10f3d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d3e863e307c40b6eb2829835e41c772caf8a4cb0", + "revision": "a6cc73a4ec3641aae16bcf459c5b9e45a0142ddc", "repo_path": "/integration/gaia-central" } From bf0f403fbea9e8958928ebccb7b47c1c8eabe9a3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:46:17 -0700 Subject: [PATCH 17/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6add84ccfeb0..1615824518ba 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 51852bbaefbd..45ab23fed2ff 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 533260ec2414..54b219670291 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 6add84ccfeb0..1615824518ba 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 5e23b4aeb366..c4d43e19f51c 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 8ab742355535..c7edc424d7e1 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 95b2d25f2cea..d38766c4c148 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 7b3569c0b02d..159be6f8f9ad 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 de20593fd62e..1fc6bcd27306 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 28d093aac3f8..54860d204db6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 48442a92827b065084a0f7da0c5e3c2640d93bfd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:56:05 -0700 Subject: [PATCH 18/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cb3ab98cbc87 Author: Arnau Desc: Merge pull request #17851 from rnowm/990528 Bug 990528 - [Messaging][Visual refresh][Regression] Adding several recipients breaks the layout r=bfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/c1281d4712ba Author: rnowm Desc: Bug 990528 - [Messaging][Visual refresh][Regression] Adding several recipients breaks the layout --- 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 584851c10f3d..f50aa5dedc9f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "a6cc73a4ec3641aae16bcf459c5b9e45a0142ddc", + "revision": "cb3ab98cbc87e3bcb95cc5021318e87892118ef1", "repo_path": "/integration/gaia-central" } From 5a7f3eb1946e4c6f6f9d3fe891a0489b2c94718d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 06:57:38 -0700 Subject: [PATCH 19/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1615824518ba..bdbd4a9e7757 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 45ab23fed2ff..76cfe85a7c57 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 54b219670291..f44bfa6259b9 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 1615824518ba..bdbd4a9e7757 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c4d43e19f51c..590404521bf5 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 c7edc424d7e1..28239bf9e2fd 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 d38766c4c148..08de5c3ec53d 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 159be6f8f9ad..f2fc255d3413 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 1fc6bcd27306..48a4a70f0a1a 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 54860d204db6..f1f7faf27184 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0743dc1fa594285af2fadaedcf28158b9bf17d42 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 07:36:13 -0700 Subject: [PATCH 20/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b5bdd63fc3cd Author: AndreiH Desc: Merge pull request #17905 from bebef1987/xfail_cost Bug 991076 - Xfail test_cost_control_data_alert_mobile failing because B... ======== https://hg.mozilla.org/integration/gaia-central/rev/9d6e732bcbc2 Author: Bebe Desc: Bug 991076 - Xfail test_cost_control_data_alert_mobile failing because Bug 991067 --- 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 f50aa5dedc9f..9d3681e5aacf 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "cb3ab98cbc87e3bcb95cc5021318e87892118ef1", + "revision": "b5bdd63fc3cd3d8326e717795ddc8b9e9e15bb6a", "repo_path": "/integration/gaia-central" } From 666048dd13fec135c9576e853757a530dbc66320 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 07:37:39 -0700 Subject: [PATCH 21/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index bdbd4a9e7757..56d2193bd4b7 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 76cfe85a7c57..556e1e64d292 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 f44bfa6259b9..2b078e463fc4 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 bdbd4a9e7757..56d2193bd4b7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 590404521bf5..164c9e02de10 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 28239bf9e2fd..56ddde5348ba 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 08de5c3ec53d..7c59dfce5aa0 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 f2fc255d3413..3c18ac68b869 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 48a4a70f0a1a..c1a4b05d32ca 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 f1f7faf27184..9c1bda22198c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From dbbc78db5fc9d0eb8a1f05059fbd4dd50e598858 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Tue, 1 Apr 2014 15:11:36 +0800 Subject: [PATCH 22/38] Bug 990383 - Set default value of 'supportedNetworkTypes' as 'wcdma/gsm'. r=hsinyi --- .../test_mobile_preferred_network_type.js | 27 ++++++++++++++----- dom/system/gonk/ril_consts.js | 2 +- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js b/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js index 65abf2c64ea7..447377d8dabb 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js @@ -50,17 +50,32 @@ function doFailToSetPreferredNetworkType(preferredNetworkType, expectedError, ca }; } +function getSupportedNetworkTypesFromSystemProperties(clientId, callback) { + let key = "ro.moz.ril." + clientId + ".network_types"; + + runEmulatorShell(["getprop", key], function(results) { + let result = results[0]; + if (!result || result === "") { + // Copied from GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT in dom/system/gonk/ril_consts.js. + result = "wcdma,gsm"; + } + callback(result.split(",")); + }); +} + /* Test supportedNetworkTypes */ taskHelper.push(function testSupportedNetworkTypes() { let supportedNetworkTypes = mobileConnection.supportedNetworkTypes; - ok(Array.isArray(supportedNetworkTypes), "supportedNetworkTypes should be an array"); - ok(supportedNetworkTypes.indexOf("gsm") >= 0, "Should support 'gsm'"); - ok(supportedNetworkTypes.indexOf("wcdma") >= 0, "Should support 'wcdma'"); - ok(supportedNetworkTypes.indexOf("cdma") >= 0, "Should support 'cdma'"); - ok(supportedNetworkTypes.indexOf("evdo") >= 0, "Should support 'evdo'"); - taskHelper.runNext(); + getSupportedNetworkTypesFromSystemProperties(0, function(testData) { + is(testData.length, supportedNetworkTypes.length); + for (let i = 0; i < testData.length; i++) { + ok(supportedNetworkTypes.indexOf(testData[i]) >= 0, "Should support '" + testData[i] + "'"); + } + + taskHelper.runNext(); + }); }); /* Test switching to supported preferred types */ diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js index b2738846fb2b..f43075eb9b13 100644 --- a/dom/system/gonk/ril_consts.js +++ b/dom/system/gonk/ril_consts.js @@ -430,7 +430,7 @@ this.RIL_PREFERRED_NETWORK_TYPE_TO_GECKO = [ GECKO_PREFERRED_NETWORK_TYPE_LTE_ONLY ]; -this.GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT = "gsm,wcdma,cdma,evdo"; +this.GECKO_SUPPORTED_NETWORK_TYPES_DEFAULT = "gsm,wcdma"; this.GECKO_SUPPORTED_NETWORK_TYPES = [ "gsm", "wcdma", From dfb52284bae65055ce17c74210a19f9a8596f249 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 07:57:49 -0700 Subject: [PATCH 23/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3d43c0bce3a9 Author: Florin Strugariu Desc: Merge pull request #17908 from AndreiH/bug991076 Bug 991076 - Xfail test_cost_control_data_alert_mobile failing because B... ======== https://hg.mozilla.org/integration/gaia-central/rev/fd0df9a1107e Author: Andrei Hutusoru Desc: Bug 991076 - Xfail test_cost_control_data_alert_mobile failing because Bug 991067 --- 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 9d3681e5aacf..3f53a707e445 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b5bdd63fc3cd3d8326e717795ddc8b9e9e15bb6a", + "revision": "3d43c0bce3a9194c9f3120a33a89a91671befc02", "repo_path": "/integration/gaia-central" } From 590fd6de29535fec4d2b7abb830afc7555459e40 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 07:58:00 -0700 Subject: [PATCH 24/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 56d2193bd4b7..c81a3d816a99 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 556e1e64d292..c407cf355edd 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 2b078e463fc4..11c5ec02ba2d 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 56d2193bd4b7..c81a3d816a99 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 164c9e02de10..e111d1a289a6 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 56ddde5348ba..88985175e040 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 7c59dfce5aa0..e2a1d8a4e2fe 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 3c18ac68b869..3257816bc502 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 c1a4b05d32ca..f44de33a9d84 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 9c1bda22198c..179fb57a5192 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From f9994496d3ed4c9a07a1175882d51c1df9fbf3b0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 08:16:04 -0700 Subject: [PATCH 25/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4b83b2738465 Author: Douglas Sherk Desc: Merge pull request #17665 from DouglasSherk/987211-clock-lock-call Bug 987211 - [Dialer][Lockscreen] Fix clock being invisible when receiving a call while screen locked. r=rik ======== https://hg.mozilla.org/integration/gaia-central/rev/36047b2510e1 Author: DouglasSherk Desc: Bug 987211 - Make sure l10n_date is loaded before calling back in LazyL10n.get(). r=rik --- 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 3f53a707e445..414e19a7af83 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3d43c0bce3a9194c9f3120a33a89a91671befc02", + "revision": "4b83b27384652d51757f607792b8a74976cde452", "repo_path": "/integration/gaia-central" } From f3479cf027c1136168a11f515e7478f7a5129924 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 08:21:16 -0700 Subject: [PATCH 26/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c81a3d816a99..4e943b02ad86 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 c407cf355edd..4743428cfa28 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 11c5ec02ba2d..c9fe1cdd2399 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 c81a3d816a99..4e943b02ad86 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e111d1a289a6..4c6209d87552 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 88985175e040..e9b0e62f57a6 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 e2a1d8a4e2fe..c10febf5ba2a 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 3257816bc502..e42d7395ce35 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 f44de33a9d84..5f7e6a35939c 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 179fb57a5192..a7a47c1dc61d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From cd08a4ea34d0c8bdf5b9b2e1afaa0e5d3920a23d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 08:31:01 -0700 Subject: [PATCH 27/38] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/14aa592477c1 Author: Gareth Aye Desc: Remove incorrect comment about calendar marionette 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 414e19a7af83..4081d9df7d5b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4b83b27384652d51757f607792b8a74976cde452", + "revision": "14aa592477c10bcaed9bd95b7b6da4beaed20647", "repo_path": "/integration/gaia-central" } From 49c30e5711b36278df04e81e29753531c0699793 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 08:36:09 -0700 Subject: [PATCH 28/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4e943b02ad86..55a7240001da 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 4743428cfa28..e2b1a0daa370 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 c9fe1cdd2399..46e3fd32c81d 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 4e943b02ad86..55a7240001da 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 4c6209d87552..fcff6786696c 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 e9b0e62f57a6..27c796138c36 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 c10febf5ba2a..0bf2accc96c5 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 e42d7395ce35..b8ce7f4cc1cd 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 5f7e6a35939c..304ee1b00a4b 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 a7a47c1dc61d..735a8a36308b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From eb30bb6d1eeffc872b3ed05e648fd48b0d26e69c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 09:21:11 -0700 Subject: [PATCH 29/38] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b8eae9817bd2 Author: Gareth Aye Desc: Merge pull request #17861 from gaye/bug-987350 Bug 987350 - Migrate alarm_test.js to use new view code r=millermedeiros ======== https://hg.mozilla.org/integration/gaia-central/rev/e00e22596b46 Author: Gareth Aye Desc: Bug 987350 - Migrate alarm_test.js to use new view code ======== https://hg.mozilla.org/integration/gaia-central/rev/d75dc1c0083b Author: Rudy Lu Desc: Merge pull request #17893 from RudyLu/value_selector/remove-mozKeyboard Bug 986992 - Remvoe navigator.mozKeyboard and use navigator.mozInputMethod r=rudylu ======== https://hg.mozilla.org/integration/gaia-central/rev/63bd5af5a680 Author: Rudy Lu Desc: Remove system app from mock keyboard app list. ======== https://hg.mozilla.org/integration/gaia-central/rev/d1a51a625bd9 Author: Yuan Xulei Desc: Bug 986992 - Remvoe navigator.mozKeyboard and use navigator.mozInputMethod instead. --- 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 4081d9df7d5b..96c0635888da 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "14aa592477c10bcaed9bd95b7b6da4beaed20647", + "revision": "b8eae9817bd2edc1b10c931c413fa453644388bb", "repo_path": "/integration/gaia-central" } From 1c8d30f58abef8500a6476f7f2ac6004eb5b60ef Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 09:26:22 -0700 Subject: [PATCH 30/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 55a7240001da..ea88635c276d 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 e2b1a0daa370..ace8c19c36f1 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 46e3fd32c81d..1aec72ad5eba 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 55a7240001da..ea88635c276d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index fcff6786696c..0125ac1606fb 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 27c796138c36..23920faf0186 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 0bf2accc96c5..be6c1a3d3c5a 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 b8ce7f4cc1cd..924320d6e922 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 304ee1b00a4b..625436385830 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 735a8a36308b..e1c154cae629 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7c29d59775c91f204a230eb7774022d57d0ef214 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 10:20:57 -0700 Subject: [PATCH 31/38] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f57ba3848b8d Author: Francisco Jordano Desc: Merge pull request #17897 from arcturus/bug-990496 Bug 990496 - [Contacts] Error when user tries to cancel importing contacts ======== https://hg.mozilla.org/integration/gaia-central/rev/49f264631fcf Author: Francisco Jordano Desc: Bug 990496 - [Contacts] Error when user tries to cancel importing contacts ======== https://hg.mozilla.org/integration/gaia-central/rev/e9efe93a8c36 Author: Wilson Page Desc: Merge pull request #17877 from verchaswa/Bug989023_Camera_MADAI_Mozilla_image_Preview_button_needs_highlight_state [Bug 989023][Camera][Madai][Mozilla]Image Preview button needs highlight... ======== https://hg.mozilla.org/integration/gaia-central/rev/fc14d2e8deb5 Author: verchaswa.sharma Desc: [Bug 989023][Camera][Madai][Mozilla]Image Preview button needs highlight state --- 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 96c0635888da..184bd8cb5c29 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b8eae9817bd2edc1b10c931c413fa453644388bb", + "revision": "f57ba3848b8d880bef4962ab09d3699a65f7d7a1", "repo_path": "/integration/gaia-central" } From 4d5509f4c6d54d7e581fd9fbc34ab94b2432b8ee Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 10:22:37 -0700 Subject: [PATCH 32/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ea88635c276d..f438a5ee3ab2 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 ace8c19c36f1..b9049503cfa9 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 1aec72ad5eba..86235020ddef 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 ea88635c276d..f438a5ee3ab2 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0125ac1606fb..e900306e0c65 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 23920faf0186..997f28e965cf 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 be6c1a3d3c5a..8712d6ba090f 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 924320d6e922..fcdd8600a431 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 625436385830..be05229b8d6e 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 e1c154cae629..e4d359b0ced3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7fe61c1882e9ce0a47baf8ad77e6aa96c12c0344 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 11:03:40 -0700 Subject: [PATCH 33/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d3d4d797d0c5 Author: ochameau Desc: Merge pull request #17533 from jryans/devtools-server-tests Bug 986223 - Test Dev Tools server toggling r=@ochameau ======== https://hg.mozilla.org/integration/gaia-central/rev/3a056e561b21 Author: J. Ryan Stinnett Desc: Bug 986223 - Test Dev Tools server toggling --- 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 184bd8cb5c29..942b57415a39 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f57ba3848b8d880bef4962ab09d3699a65f7d7a1", + "revision": "d3d4d797d0c51bd584c7765a4b8057638df5a21d", "repo_path": "/integration/gaia-central" } From 627251c07914c196abc39c4c7699c60d6a1a9688 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 11:03:51 -0700 Subject: [PATCH 34/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f438a5ee3ab2..161fbc8971e4 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 b9049503cfa9..a5d213b941a3 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 86235020ddef..32704016792c 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 f438a5ee3ab2..161fbc8971e4 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e900306e0c65..6621ec64eda2 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 997f28e965cf..0b2a54cd8dfd 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 8712d6ba090f..8187b822ab04 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 fcdd8600a431..1548584546d6 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 be05229b8d6e..7d8110ac6cb1 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 e4d359b0ced3..30d47b6e52c7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 814af7f425432aa8c6ed6beb0b699a5ea2f08069 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 11:06:11 -0700 Subject: [PATCH 35/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/67a734858540 Author: Wilson Page Desc: Merge pull request #17904 from wilsonpage/bug/990255 Bug 990255 - [Camera][Mozilla] 1.4 Zoom bar and indicators are too close... ======== https://hg.mozilla.org/integration/gaia-central/rev/374f95d4a049 Author: Wilson Page Desc: Bug 990255 - [Camera][Mozilla] 1.4 Zoom bar and indicators are too close to each other when rotated 180 --- 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 942b57415a39..809ad950f11a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d3d4d797d0c51bd584c7765a4b8057638df5a21d", + "revision": "67a734858540e74ec73f74c11b1c1cce157d605a", "repo_path": "/integration/gaia-central" } From 827492cfc86791adab85c27a4c71329c7133b554 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 11:11:18 -0700 Subject: [PATCH 36/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 161fbc8971e4..f85c85240f79 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 a5d213b941a3..94a30ee926e5 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 32704016792c..e186612ac323 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 161fbc8971e4..f85c85240f79 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 6621ec64eda2..7be985b708e9 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 0b2a54cd8dfd..075faf8aa19d 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 8187b822ab04..8f42af47c266 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 1548584546d6..668eb10b4201 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 7d8110ac6cb1..3ac3e3fcc50b 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 30d47b6e52c7..50275ecf32d3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 1186589567b9b9b591e28d25f1aab8a77e623a42 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 11:46:16 -0700 Subject: [PATCH 37/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f2784b078a4b Author: Wilson Page Desc: Merge pull request #17902 from wilsonpage/bug/988108 Bug 988108 - [camera][madai] capitalization corrections ======== https://hg.mozilla.org/integration/gaia-central/rev/14b0dd615333 Author: Wilson Page Desc: Bug 988108 - [camera][madai] capitalization corrections --- 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 809ad950f11a..e08422bc6de7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "67a734858540e74ec73f74c11b1c1cce157d605a", + "revision": "f2784b078a4b58c1f0af8238d5325d0f05dc9fc0", "repo_path": "/integration/gaia-central" } From 66a91c7f589bcf79034a19fd940df7bf04ef47c5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Apr 2014 11:47:54 -0700 Subject: [PATCH 38/38] 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/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f85c85240f79..aeeaa1622b98 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 94a30ee926e5..6e3a1fa29a50 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 e186612ac323..4d0aa86dab2c 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 f85c85240f79..aeeaa1622b98 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 7be985b708e9..79f7ff5f87c6 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 075faf8aa19d..961e7cf454c7 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 8f42af47c266..fa9534a6f64e 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 668eb10b4201..9ac501521fc4 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 3ac3e3fcc50b..b9fcad95c0de 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 50275ecf32d3..db11dd641b32 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +