From 754c9c4ad297affa6677d8950034b85a126030b5 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 13 Dec 2013 13:00:30 -0800 Subject: [PATCH 01/18] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f3f08c4170e5 Author: Marcus Cavanaugh Desc: Merge pull request #14661 from mcav/autoconfig-xhr Bug 942795 - [email] autoconfig XHR callbacks seem to be firing multiple times on nightly. r=asuth a=fabrice ======== https://hg.mozilla.org/integration/gaia-central/rev/01f210c13827 Author: Marcus Cavanaugh Desc: Bug 942795 - [email] autoconfig XHR callbacks seem to be firing multiple times on nightly. r=asuth a=fabrice --- 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 c14c25b2ebc..711b1587a30 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "62c0ad5b88f15d5da1cc2496b9534087dbc5d015", + "revision": "f3f08c4170e57956cba530affcb5a9fc51db46c5", "repo_path": "/integration/gaia-central" } From 04d93202a2411259c36fc53e6213de413830859d Mon Sep 17 00:00:00 2001 From: Kevin Grandon Date: Fri, 13 Dec 2013 16:10:56 -0500 Subject: [PATCH 02/18] Bug 942749 - [keyboard] Fix forms.js contenteditable scroll position. r=fabrice --- dom/inputmethod/forms.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dom/inputmethod/forms.js b/dom/inputmethod/forms.js index be99a96e255..3185dde2225 100644 --- a/dom/inputmethod/forms.js +++ b/dom/inputmethod/forms.js @@ -415,7 +415,7 @@ let FormAssistant = { this.scrollIntoViewTimeout = content.setTimeout(function () { this.scrollIntoViewTimeout = null; if (this.focusedElement && !FormVisibility.isVisible(this.focusedElement)) { - this.focusedElement.scrollIntoView(false); + scrollSelectionOrElementIntoView(this.focusedElement); } }.bind(this), RESIZE_SCROLL_DELAY); } @@ -1017,6 +1017,23 @@ function setSelectionRange(element, start, end) { } } +/** + * Scroll the given element into view. + * + * Calls scrollSelectionIntoView for contentEditable elements. + */ +function scrollSelectionOrElementIntoView(element) { + let editor = getPlaintextEditor(element); + if (editor) { + editor.selectionController.scrollSelectionIntoView( + Ci.nsISelectionController.SELECTION_NORMAL, + Ci.nsISelectionController.SELECTION_FOCUS_REGION, + Ci.nsISelectionController.SCROLL_SYNCHRONOUS); + } else { + element.scrollIntoView(false); + } +} + // Get nsIPlaintextEditor object from an input field function getPlaintextEditor(element) { let editor = null; From 208137ff18d6cce6d724145c9aaf5a776e60e12b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 13 Dec 2013 14:40:25 -0800 Subject: [PATCH 03/18] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a8720a418a85 Author: Marcus Cavanaugh Desc: Merge pull request #14667 from mcav/utf7 Bug 938321 - [email/backend] Implement utf-7 charset support using hand-rolled decoder. r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/5037ab809d20 Author: Marcus Cavanaugh Desc: Bug 938321 - [email/backend] Implement utf-7 charset support using hand-rolled decoder. ======== https://hg.mozilla.org/integration/gaia-central/rev/f1fcc0bf2d28 Author: Julien Wajsberg Desc: Merge pull request #14508 from julienw/942863-use-height-instead-of-border-bottom Bug 942863 - Workaround for a Gecko bug in SMS app with APZ enabled. r=borja ======== https://hg.mozilla.org/integration/gaia-central/rev/d3ac0ec93099 Author: Julien Wajsberg Desc: Bug 942863 - [SMS] The messages list content can not be scrolled to the end r=borja --- 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 711b1587a30..6a69a7a7763 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f3f08c4170e57956cba530affcb5a9fc51db46c5", + "revision": "a8720a418a856aa3d51263eee70fc40df28ad9b2", "repo_path": "/integration/gaia-central" } From 3efa10b5aad0f1d4d4e96deceea82151aa56b0d2 Mon Sep 17 00:00:00 2001 From: "glacroix@mozilla.com" Date: Fri, 13 Dec 2013 15:31:39 -0800 Subject: [PATCH 04/18] Bug 945366 - Download 'error' attribute throws when accessed and value is null. r=gwagner --- dom/downloads/src/DownloadsAPI.js | 10 +++++++++- dom/downloads/tests/test_downloads_basic.html | 10 +++------- dom/webidl/Downloads.webidl | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dom/downloads/src/DownloadsAPI.js b/dom/downloads/src/DownloadsAPI.js index a87ca1d4445..668c24c70af 100644 --- a/dom/downloads/src/DownloadsAPI.js +++ b/dom/downloads/src/DownloadsAPI.js @@ -206,9 +206,9 @@ function DOMDownloadImpl() { this.path = null; this.state = "stopped"; this.contentType = null; - this.error = null; /* fields that require getters/setters */ + this._error = null; this._startTime = new Date(); /* private fields */ @@ -247,6 +247,14 @@ DOMDownloadImpl.prototype = { return this.__DOM_IMPL__.getEventHandler("onstatechange"); }, + get error() { + return this._error; + }, + + set error(aError) { + this._error = aError; + }, + get startTime() { return this._startTime; }, diff --git a/dom/downloads/tests/test_downloads_basic.html b/dom/downloads/tests/test_downloads_basic.html index 943da381630..c5ada1a0ea6 100644 --- a/dom/downloads/tests/test_downloads_basic.html +++ b/dom/downloads/tests/test_downloads_basic.html @@ -51,14 +51,10 @@ function checkConsistentDownloadAttributes(download) { todo(download.path === expectedDownloadPath, "Download path = " + expectedDownloadPath); - // bug 948287: Accessing startTime attribute at download start fires - // NS_ERROR_UNEXPECTED in emulator - //ok(download.startTime >= todayDate, - // "Download start time should be greater than or equal to today"); + ok(download.startTime >= todayDate, + "Download start time should be greater than or equal to today"); - // bug 945366: Accessing error attribute at download start fires - // NS_ERROR_UNEXPECTED in emulator - //is(download.error, null, "Download does not have an error"); + is(download.error, null, "Download does not have an error"); is(download.url, expectedServeURL, "Download URL = " + expectedServeURL); diff --git a/dom/webidl/Downloads.webidl b/dom/webidl/Downloads.webidl index e547868991b..862e3b807c3 100644 --- a/dom/webidl/Downloads.webidl +++ b/dom/webidl/Downloads.webidl @@ -59,7 +59,7 @@ interface DOMDownload : EventTarget { // A DOM error object, that will be not null when a download is stopped // because something failed. - readonly attribute DOMError error; + readonly attribute DOMError? error; // Pauses the download. Promise pause(); From a8aca2647867c174a811753fe7e198703a585b3e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 13 Dec 2013 15:55:23 -0800 Subject: [PATCH 05/18] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a8e6d298564a Author: John Ford Desc: Revert "Merge pull request #14632 from alivedise/bugzilla/948596_v2/activity-window-size-copy" This reverts commit 888f9df5515a47d2f5806efee77485e05e1e5416, reversing changes made to 53b010647062b4e2637f98ac3538af1c7bfe723a. This was backed out because of https://bugzilla.mozilla.org/show_bug.cgi?id=950136#c11 --- 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 6a69a7a7763..7eb83e96893 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a8720a418a856aa3d51263eee70fc40df28ad9b2", + "revision": "a8e6d298564ac14c79d23ab170be2599f8ae9678", "repo_path": "/integration/gaia-central" } From 1c63e8351ffc5ce98de03f36a69c623978223800 Mon Sep 17 00:00:00 2001 From: Dimi Lee Date: Wed, 11 Dec 2013 14:04:27 +0800 Subject: [PATCH 06/18] Bug 947100 - B2G NFC: enable/disable NFC worker at runtime. r=yoshi --- dom/nfc/nsNfc.js | 8 ++++++-- dom/system/gonk/Nfc.js | 7 ++++++- dom/system/gonk/NfcContentHelper.js | 7 ++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dom/nfc/nsNfc.js b/dom/nfc/nsNfc.js index 8cf28137450..55f865d796d 100644 --- a/dom/nfc/nsNfc.js +++ b/dom/nfc/nsNfc.js @@ -138,8 +138,12 @@ MozNFCPeer.prototype = { */ function mozNfc() { debug("In mozNfc Constructor"); - this._nfcContentHelper = Cc["@mozilla.org/nfc/content-helper;1"] - .getService(Ci.nsINfcContentHelper); + try { + this._nfcContentHelper = Cc["@mozilla.org/nfc/content-helper;1"] + .getService(Ci.nsINfcContentHelper); + } catch(e) { + debug("No NFC support.") + } } mozNfc.prototype = { _nfcContentHelper: null, diff --git a/dom/system/gonk/Nfc.js b/dom/system/gonk/Nfc.js index 67152fc4d7a..c2a489ef426 100644 --- a/dom/system/gonk/Nfc.js +++ b/dom/system/gonk/Nfc.js @@ -25,6 +25,9 @@ Cu.import("resource://gre/modules/Services.jsm"); let NFC = {}; Cu.import("resource://gre/modules/nfc_consts.js", NFC); +Cu.import("resource://gre/modules/systemlibs.js"); +const NFC_ENABLED = libcutils.property_get("ro.moz.nfc.enabled", "false") === "true"; + // set to true in nfc_consts.js to see debug messages let DEBUG = NFC.DEBUG_NFC; @@ -627,4 +630,6 @@ Nfc.prototype = { } }; -this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Nfc]); +if (NFC_ENABLED) { + this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Nfc]); +} diff --git a/dom/system/gonk/NfcContentHelper.js b/dom/system/gonk/NfcContentHelper.js index 623206212fd..2ed5b17670a 100644 --- a/dom/system/gonk/NfcContentHelper.js +++ b/dom/system/gonk/NfcContentHelper.js @@ -26,6 +26,9 @@ Cu.import("resource://gre/modules/DOMRequestHelper.jsm"); let NFC = {}; Cu.import("resource://gre/modules/nfc_consts.js", NFC); +Cu.import("resource://gre/modules/systemlibs.js"); +const NFC_ENABLED = libcutils.property_get("ro.moz.nfc.enabled", "false") === "true"; + // set to true to in nfc_consts.js to see debug messages let DEBUG = NFC.DEBUG_CONTENT_HELPER; @@ -384,4 +387,6 @@ NfcContentHelper.prototype = { }, }; -this.NSGetFactory = XPCOMUtils.generateNSGetFactory([NfcContentHelper]); +if (NFC_ENABLED) { + this.NSGetFactory = XPCOMUtils.generateNSGetFactory([NfcContentHelper]); +} From c70454c76c5a7378ab5125c9e15be3787b0fd61a Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 13 Dec 2013 20:20:23 -0800 Subject: [PATCH 07/18] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/45fc76dab544 Author: Timothy Guan-tin Chien Desc: Merge pull request #14638 from timdream/include-pinyin Bug 949958 - Include Pinyin IME in eng build by default, r=djf ======== https://hg.mozilla.org/integration/gaia-central/rev/3a118a3c0534 Author: Timothy Guan-tin Chien Desc: Bug 949958 - Include Pinyin IME in eng build by default --- 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 7eb83e96893..1c68ef678c9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a8e6d298564ac14c79d23ab170be2599f8ae9678", + "revision": "45fc76dab5449af2aa333a92251780291a8334ac", "repo_path": "/integration/gaia-central" } From ae78283bb95e1dfc8f2641303ec23837a68233a8 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sat, 14 Dec 2013 10:40:24 -0800 Subject: [PATCH 08/18] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5449cb5b262e Author: Anthony Ricaud Desc: Revert "Merge pull request #14667 from mcav/utf7" This reverts commit cfa88581f0bdaa3d4b7a3773ae87edc55260a2ab, reversing changes made to b44a75862ebcb651381eabc9c3a3b203d76d63bf. This is breaking 6 integration 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 1c68ef678c9..4a263b16670 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "45fc76dab5449af2aa333a92251780291a8334ac", + "revision": "5449cb5b262e434869f7d0926ccc675c77e1b9f1", "repo_path": "/integration/gaia-central" } From 1f902a595b15c39f26688930ca1216d245b6b7de Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Sat, 14 Dec 2013 11:44:57 -0800 Subject: [PATCH 09/18] Bug 915974 - Make adb stay on if USB functions are being used. r=fabrice --- b2g/chrome/content/settings.js | 60 ++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js index 8db0360d785..5c2b9b30760 100644 --- a/b2g/chrome/content/settings.js +++ b/b2g/chrome/content/settings.js @@ -223,6 +223,7 @@ let AdbController = { lockEnabled: undefined, disableAdbTimer: null, disableAdbTimeoutHours: 12, + umsActive: false, debug: function(str) { dump("AdbController: " + str + "\n"); @@ -304,6 +305,51 @@ let AdbController = { }, updateState: function() { + this.umsActive = false; + this.storages = navigator.getDeviceStorages('sdcard'); + this.updateStorageState(0); + }, + + updateStorageState: function(storageIndex) { + if (storageIndex >= this.storages.length) { + // We've iterated through all of the storage objects, now we can + // really do updateStateInternal. + this.updateStateInternal(); + return; + } + let storage = this.storages[storageIndex]; + if (this.DEBUG) { + this.debug("Checking availability of storage: '" + + storage.storageName); + } + + let req = storage.available(); + req.onsuccess = function(e) { + if (this.DEBUG) { + this.debug("Storage: '" + storage.storageName + "' is '" + + e.target.result); + } + if (e.target.result == 'shared') { + // We've found a storage area that's being shared with the PC. + // We can stop looking now. + this.umsActive = true; + this.updateStateInternal(); + return; + } + this.updateStorageState(storageIndex + 1); + }.bind(this); + req.onerror = function(e) { + dump("AdbController: error querying storage availability for '" + + this.storages[storageIndex].storageName + "' (ignoring)\n"); + this.updateStorageState(storageIndex + 1); + }.bind(this); + }, + + updateStateInternal: function() { + if (this.DEBUG) { + this.debug("updateStateInternal: called"); + } + if (this.remoteDebuggerEnabled === undefined || this.lockEnabled === undefined || this.locked === undefined) { @@ -338,8 +384,15 @@ let AdbController = { this.debug("isDebugging=" + isDebugging); } + // If USB Mass Storage, USB tethering, or a debug session is active, + // then we don't want to disable adb in an automatic fashion (i.e. + // when the screen locks or due to timeout). + let sysUsbConfig = libcutils.property_get("sys.usb.config"); + let rndisActive = (sysUsbConfig.split(",").indexOf("rndis") >= 0); + let usbFuncActive = rndisActive || this.umsActive || isDebugging; + let enableAdb = this.remoteDebuggerEnabled && - (!(this.lockEnabled && this.locked) || isDebugging); + (!(this.lockEnabled && this.locked) || usbFuncActive); let useDisableAdbTimer = true; try { @@ -359,7 +412,8 @@ let AdbController = { this.debug("updateState: enableAdb = " + enableAdb + " remoteDebuggerEnabled = " + this.remoteDebuggerEnabled + " lockEnabled = " + this.lockEnabled + - " locked = " + this.locked); + " locked = " + this.locked + + " usbFuncActive = " + usbFuncActive); } // Configure adb. @@ -391,7 +445,7 @@ let AdbController = { } } if (useDisableAdbTimer) { - if (enableAdb && !isDebugging) { + if (enableAdb && !usbFuncActive) { this.startDisableAdbTimer(); } else { this.stopDisableAdbTimer(); From deab4b33bc2e3112f8a10a853037c7da3801407b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sat, 14 Dec 2013 13:55:23 -0800 Subject: [PATCH 10/18] Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/de7d1d59e942 Author: Anthony Ricaud Desc: Revert "Revert "Merge pull request #14667 from mcav/utf7"" This reverts commit 7852023abb572c522a07af558e7c19f557cc4866. That was a wrong revert, it didn't fix the failing 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 4a263b16670..bf77336385d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "5449cb5b262e434869f7d0926ccc675c77e1b9f1", + "revision": "de7d1d59e9424ae0952f773c46dad879e5cdc2ae", "repo_path": "/integration/gaia-central" } From 50ba2b6f81768bbc541e1df5d051364b80621037 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Sun, 15 Dec 2013 14:03:28 -0500 Subject: [PATCH 11/18] Bug 917673 - Throw APP_PACKAGE_INVALID when the JAR is invalid and throw APP_PACKAGE_CORRUPT when the JAR has been tampered with. r=fabrice --- dom/apps/src/Webapps.jsm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm index 167c0290142..655c9174c51 100755 --- a/dom/apps/src/Webapps.jsm +++ b/dom/apps/src/Webapps.jsm @@ -2958,8 +2958,15 @@ onInstallSuccessAck: function onInstallSuccessAck(aManifestURL, if (Components.isSuccessCode(result)) { isSigned = true; - } else if (result == Cr.NS_ERROR_FILE_CORRUPTED) { + } else if (result == Cr.NS_ERROR_SIGNED_JAR_MODIFIED_ENTRY || + result == Cr.NS_ERROR_SIGNED_JAR_UNSIGNED_ENTRY || + result == Cr.NS_ERROR_SIGNED_JAR_ENTRY_MISSING) { throw "APP_PACKAGE_CORRUPTED"; + } else if (result == Cr.NS_ERROR_FILE_CORRUPTED || + result == Cr.NS_ERROR_SIGNED_JAR_ENTRY_TOO_LARGE || + result == Cr.NS_ERROR_SIGNED_JAR_ENTRY_INVALID || + result == Cr.NS_ERROR_SIGNED_JAR_MANIFEST_INVALID) { + throw "APP_PACKAGE_INVALID"; } else if ((!aIsLocalFileInstall || isLaterThanBuildTime) && (result != Cr.NS_ERROR_SIGNED_JAR_NOT_SIGNED)) { throw "INVALID_SIGNATURE"; From b7913dcb90efaeb2f840ec5631c8a9beede13ae0 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Sat, 14 Dec 2013 15:49:09 -0800 Subject: [PATCH 12/18] Bug 950406 - Turn on P2P mochitests in b2g desktop builds. r=jesup --- testing/mochitest/b2g-desktop.json | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/testing/mochitest/b2g-desktop.json b/testing/mochitest/b2g-desktop.json index b2d73839b6a..f611c621657 100644 --- a/testing/mochitest/b2g-desktop.json +++ b/testing/mochitest/b2g-desktop.json @@ -294,33 +294,6 @@ "dom/imptests/editing/conformancetest/test_runtest.html":"takes too long", - "dom/media/tests/mochitest/test_dataChannel_basicAudio.html":"bug 908473", - "dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html":"", - "dom/media/tests/mochitest/test_dataChannel_basicAudioVideoCombined.html":"", - "dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html":"", - "dom/media/tests/mochitest/test_dataChannel_basicVideo.html":"", - "dom/media/tests/mochitest/test_dataChannel_noOffer.html":"", - "dom/media/tests/mochitest/test_peerConnection_addCandidateInHaveLocalOffer.html":"", - "dom/media/tests/mochitest/test_peerConnection_basicAudio.html":"", - "dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html":"", - "dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html":"", - "dom/media/tests/mochitest/test_peerConnection_basicVideo.html":"", - "dom/media/tests/mochitest/test_peerConnection_bug822674.html":"", - "dom/media/tests/mochitest/test_peerConnection_bug825703.html":"", - "dom/media/tests/mochitest/test_peerConnection_bug827843.html":"", - "dom/media/tests/mochitest/test_peerConnection_bug834153.html":"", - "dom/media/tests/mochitest/test_peerConnection_bug835370.html":"", - "dom/media/tests/mochitest/test_peerConnection_errorCallbacks.html":"", - "dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html":"", - "dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html":"", - "dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html":"", - "dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html":"", - "dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html":"", - "dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html":"", - "dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html":"", - "dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html":"", - "dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html":"", - "dom/media/tests/mochitest/test_peerConnection_throwInCallbacks.html":"", "dom/media/tests/ipc/test_ipc.html":"nested ipc not working", "dom/network/tests/test_networkstats_basics.html":"Will be fixed in bug 858005", From e08c0951bacfa9e69adc0cbcd29fb4a494c9e332 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sun, 15 Dec 2013 11:45:24 -0800 Subject: [PATCH 13/18] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f88be8e2bdfe Author: Etienne Segonzac Desc: Merge pull request #14660 from etiennesegonzac/bug-949487-window-manager-insta-kill Bug 949487 - Harden the AppWindowManager against apps that gets insta-killed r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/cabdfa599bb7 Author: Etienne Segonzac Desc: Bug 949487 - Harden the AppWindowManager against app that gets insta-killed --- 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 bf77336385d..ce46db44bbc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "de7d1d59e9424ae0952f773c46dad879e5cdc2ae", + "revision": "f88be8e2bdfecbd76666fd486bd54fd7276f99c1", "repo_path": "/integration/gaia-central" } From 9a2078eb205a2a523c4515a417562cada7986f4d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sun, 15 Dec 2013 17:15:24 -0800 Subject: [PATCH 14/18] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/054b7aea884b Author: Anthony Ricaud Desc: Merge pull request #14617 from Rik/move-status-messages-949542 Bug 949542 - Status messages are a bit too high r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/9540dd67f8a7 Author: Anthony Ricaud Desc: Bug 949542 - Status messages are a bit too high ======== https://hg.mozilla.org/integration/gaia-central/rev/32a0985c1b98 Author: Anthony Ricaud Desc: Merge pull request #14614 from Rik/call-screen-banner-multiline-946742 Bug 946742 - Message overlapped during multiparty when a call is released r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/66d405973b78 Author: Anthony Ricaud Desc: Bug 946742 - Message overlapped during multiparty when a call is released --- 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 ce46db44bbc..969802ee5b6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f88be8e2bdfecbd76666fd486bd54fd7276f99c1", + "revision": "054b7aea884b244d9d6303e8b7361104734d631c", "repo_path": "/integration/gaia-central" } From 3df702b4f3b597d78bfdb301ff31a11f2913185f Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sun, 15 Dec 2013 18:05:28 -0800 Subject: [PATCH 15/18] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/345f69046067 Author: George Desc: Merge pull request #14641 from cctuan/949966 Bug 949966 - [Gallery] empty message of delete dialog ======== https://hg.mozilla.org/integration/gaia-central/rev/dad53410a020 Author: cctuan Desc: Bug 949966 - [Gallery] empty message of delete dialog --- 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 969802ee5b6..9130bece3b0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "054b7aea884b244d9d6303e8b7361104734d631c", + "revision": "345f6904606712c9029d13a19bb59f93616aa18d", "repo_path": "/integration/gaia-central" } From 512b793981924280dd3c484789dd0aef0813ace4 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sun, 15 Dec 2013 18:30:23 -0800 Subject: [PATCH 16/18] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a8f8d540eb85 Author: gasolin Desc: Merge pull request #14681 from gasolin/issue-950082 Revert "Merge pull request #13875 from gasolin/issue-939011" ======== https://hg.mozilla.org/integration/gaia-central/rev/ba8d8fc12ace Author: gasolin Desc: Revert "Merge pull request #13875 from gasolin/issue-939011" This reverts commit 204d32ec1dfa27d87b8ee43ae17b65c005c52b45, reversing changes made to 97fe3c8a60623821fd0ec265fb11786c3ab50431. --- 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 9130bece3b0..54f89799b6f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "345f6904606712c9029d13a19bb59f93616aa18d", + "revision": "a8f8d540eb85be0e7eeda4932cd68b9bea9fc71e", "repo_path": "/integration/gaia-central" } From 5f9feed906392d4fd5360d1bf2c7ce94efed620b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sun, 15 Dec 2013 19:45:24 -0800 Subject: [PATCH 17/18] Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/23011328ff7d Author: Alive.Kuo Desc: Merge pull request #14671 from alivedise/bugzilla/949209/publish Bug 949209 - Publish custom detail with window, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/e2a283d5e2ab Author: Hubert Figuière Desc: Bug 949209 - We now get src in detail. ======== https://hg.mozilla.org/integration/gaia-central/rev/154a435e72b5 Author: Alive Kuo Desc: Bug 949209 - Publish custom detail with window --- 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 54f89799b6f..86360e27fa1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a8f8d540eb85be0e7eeda4932cd68b9bea9fc71e", + "revision": "23011328ff7d6a9677558137ce2522e7205a780b", "repo_path": "/integration/gaia-central" } From fe70a7b63f5f0c5716780f2726c023c7726bb521 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Sun, 15 Dec 2013 20:10:23 -0800 Subject: [PATCH 18/18] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f63fa4e31cea Author: EragonJ Desc: Merge pull request #14626 from EragonJ/bug-945140-another-try Bug 945140 - [DSDS] SIM 2 can still MT/MO SMS and MT voice call in airpl... ======== https://hg.mozilla.org/integration/gaia-central/rev/6aec6f6cd451 Author: EragonJ Desc: Bug 945140 - [DSDS] SIM 2 can still MT/MO SMS and MT voice call in airplane mode. - make airplane mode work in dsds & single sim --- 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 86360e27fa1..8a674ca7034 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "23011328ff7d6a9677558137ce2522e7205a780b", + "revision": "f63fa4e31cea664886f43504529d96bc046506fc", "repo_path": "/integration/gaia-central" }