From 0dfab0fdaa9e4c184394d5169473baabebbdbfc6 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Thu, 21 Aug 2014 15:20:00 +0100 Subject: [PATCH 01/54] Bug 1048857 - stripPrefix shouldn't empty out www or protocol tokens if there's nothing else in them, r=paolo --- toolkit/components/places/UnifiedComplete.js | 6 ++- .../test_avoid_stripping_to_empty_tokens.js | 41 +++++++++++++++++++ .../places/tests/unifiedcomplete/xpcshell.ini | 1 + 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 toolkit/components/places/tests/unifiedcomplete/test_avoid_stripping_to_empty_tokens.js diff --git a/toolkit/components/places/UnifiedComplete.js b/toolkit/components/places/UnifiedComplete.js index eba31b504c2..d46ad758305 100644 --- a/toolkit/components/places/UnifiedComplete.js +++ b/toolkit/components/places/UnifiedComplete.js @@ -457,14 +457,16 @@ function getUnfilteredSearchTokens(searchString) function stripPrefix(spec) { ["http://", "https://", "ftp://"].some(scheme => { - if (spec.startsWith(scheme)) { + // Strip protocol if not directly followed by a space + if (spec.startsWith(scheme) && spec[scheme.length] != " ") { spec = spec.slice(scheme.length); return true; } return false; }); - if (spec.startsWith("www.")) { + // Strip www. if not directly followed by a space + if (spec.startsWith("www.") && spec[4] != " ") { spec = spec.slice(4); } return spec; diff --git a/toolkit/components/places/tests/unifiedcomplete/test_avoid_stripping_to_empty_tokens.js b/toolkit/components/places/tests/unifiedcomplete/test_avoid_stripping_to_empty_tokens.js new file mode 100644 index 00000000000..ec62a160cc5 --- /dev/null +++ b/toolkit/components/places/tests/unifiedcomplete/test_avoid_stripping_to_empty_tokens.js @@ -0,0 +1,41 @@ +/* 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/. */ + +add_task(function* test_protocol_trimming() { + for (let prot of ["http", "https", "ftp"]) { + let visit = { + // Include the protocol in the query string to ensure we get matches (see bug 1059395) + uri: NetUtil.newURI(prot + "://www.mozilla.org/test/?q=" + prot + encodeURIComponent("://") + "www.foo"), + title: "Test title", + transition: TRANSITION_TYPED + }; + yield promiseAddVisits(visit); + let matches = [{uri: visit.uri, title: visit.title}]; + + let inputs = [ + prot + "://", + prot + ":// ", + prot + ":// mo", + prot + "://mo te", + prot + "://www.", + prot + "://www. ", + prot + "://www. mo", + prot + "://www.mo te", + "www.", + "www. ", + "www. mo", + "www.mo te" + ]; + for (let input of inputs) { + do_log_info("Searching for: " + input); + yield check_autocomplete({ + search: input, + matches: matches + }); + } + + yield cleanup(); + } +}); + diff --git a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini index 434f46f0e14..4c22763340a 100644 --- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini +++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini @@ -11,6 +11,7 @@ tail = [test_autocomplete_on_value_removed_479089.js] [test_autoFill_default_behavior.js] [test_avoid_middle_complete.js] +[test_avoid_stripping_to_empty_tokens.js] [test_casing.js] [test_do_not_trim.js] [test_download_embed_bookmarks.js] From 22a7dfc685bb68536c531171a4a1e79475ff8fae Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 15:50:30 -0700 Subject: [PATCH 02/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/341d2e8963e9 Author: Kevin Grandon Desc: Merge pull request #23335 from KevinGrandon/bug_1052488_rocketbar_background_polish Bug 1052488 - [Rocketbar] Implement opacity/color matching to statusbar ======== https://hg.mozilla.org/integration/gaia-central/rev/08a69d76dea5 Author: Kevin Grandon Desc: Bug 1052488 - [Rocketbar] Implement opacity/color matching to statusbar r=kgrandon --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e8af6568f14..c57da14ce4e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f2dfcf31b96b8ffdf3dda0bd7b7272a07643e916", + "revision": "341d2e8963e9b1ecd0e77b7c1d960a15d161c35d", "repo_path": "/integration/gaia-central" } From 035562e8456c0a108e0d1a3623e1492d867c8c0b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 15:56:21 -0700 Subject: [PATCH 03/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 4370e349875..e5e6b718138 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2b51bd044b0..13f0151e0df 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 0f7b6966f99..382465ddcee 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 3616a94e67a..cc51aedd4d3 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 2b51bd044b0..13f0151e0df 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index e94227a4535..ff398b66a6a 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e65ef9bd6c8..ad5863cdbae 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 60e2b76abbe..67f93ec1204 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 94d263ababe..199a0f52294 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2231f6256f8..97a595440b4 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From be3ca322bec95e4c44962f1e01f11bafe49dd78a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 16:05:31 -0700 Subject: [PATCH 04/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/90c92ca23e54 Author: Jim Porter Desc: Merge pull request #23125 from jimporter/ringtones-new-sounds Bug 1046399 - (2.1-visual-refresh)[Ringtones] - Add New Tones ======== https://hg.mozilla.org/integration/gaia-central/rev/18bc013b9eac Author: Jim Porter Desc: Bug 1046399 - (2.1-visual-refresh)[Ringtones] - Add New Tones --- 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 c57da14ce4e..f6814d43c58 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "341d2e8963e9b1ecd0e77b7c1d960a15d161c35d", + "revision": "90c92ca23e5475121ae145e3175e6b762ae9eaff", "repo_path": "/integration/gaia-central" } From 6794ac7b35d9360e0a7817dba0b510d75df1f8da Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 16:11:25 -0700 Subject: [PATCH 05/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index e5e6b718138..a0d51a29887 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 13f0151e0df..23254c3a3cf 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 382465ddcee..2aa6ee864b1 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 cc51aedd4d3..c6b1d57cc36 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 13f0151e0df..23254c3a3cf 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index ff398b66a6a..bf7c60db246 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ad5863cdbae..dc836169637 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 67f93ec1204..2aab061a424 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 199a0f52294..3bdd0b2bade 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 97a595440b4..1086b8256ed 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 97afe346664cbf3f66559afbed3066ff30403022 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 16:35:31 -0700 Subject: [PATCH 06/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/147db68f9e1f Author: Jared Hirsch Desc: Merge pull request #23222 from 6a68/bug-998464-detect-offline-during-fxa-flow Bug 998464 - Show error if network goes offline during FxA flow. r=borja... ======== https://hg.mozilla.org/integration/gaia-central/rev/f1b819e40bda Author: Jared Hirsch Desc: Bug 998464 - Show error if network goes offline during FxA flow. r=borjasalguero --- 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 f6814d43c58..8d9599a15bc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "90c92ca23e5475121ae145e3175e6b762ae9eaff", + "revision": "147db68f9e1f8b1d31c59ba56c3cde57d53fcb3f", "repo_path": "/integration/gaia-central" } From ad6ef1669a7af5502c38c1c53b3d786a5c2c371c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 16:41:23 -0700 Subject: [PATCH 07/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a0d51a29887..0e1be72efcd 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 23254c3a3cf..eff95919c73 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 2aa6ee864b1..52bc64f4970 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 c6b1d57cc36..06d31002185 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 23254c3a3cf..eff95919c73 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index bf7c60db246..8432d1d169e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index dc836169637..c09827e900f 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 2aab061a424..0598d496c2e 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 3bdd0b2bade..813491b1d0d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1086b8256ed..1dacedb4361 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0d0a2d4140263efa282ed54f0237fb53703dd5cd Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Sun, 24 Aug 2014 23:52:00 +0800 Subject: [PATCH 08/54] Bug 1052865 - Mapping the request to different ID based on RIL version. r=hsinyi --- dom/system/gonk/ril_consts.js | 9 ++++----- dom/system/gonk/ril_worker.js | 36 +++++++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dom/system/gonk/ril_consts.js b/dom/system/gonk/ril_consts.js index 9e4deaf0341..08c596f158c 100644 --- a/dom/system/gonk/ril_consts.js +++ b/dom/system/gonk/ril_consts.js @@ -131,11 +131,10 @@ this.REQUEST_STK_SEND_ENVELOPE_WITH_STATUS = 107; this.REQUEST_VOICE_RADIO_TECH = 108; this.REQUEST_GET_CELL_INFO_LIST = 109; -// Flame specific parcel types. -this.REQUEST_SET_UICC_SUBSCRIPTION = 114; -this.REQUEST_SET_DATA_SUBSCRIPTION = 115; -this.REQUEST_GET_UICC_SUBSCRIPTION = 116; -this.REQUEST_GET_DATA_SUBSCRIPTION = 117; +// CAF specific parcel type. Synced with latest version. +// Please see https://www.codeaurora.org/cgit/quic/la/platform/hardware/ril/tree/include/telephony/ril.h?h=b2g_kk_3.5 +this.REQUEST_SET_UICC_SUBSCRIPTION = 115; +this.REQUEST_SET_DATA_SUBSCRIPTION = 116; // UICC Secure Access. this.REQUEST_SIM_OPEN_CHANNEL = 121; diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 9d42e0f8cfc..41bf160be2c 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -170,7 +170,7 @@ BufObject.prototype = { // We're going to leave room for the parcel size at the beginning. this.outgoingIndex = this.PARCEL_SIZE_SIZE; - this.writeInt32(type); + this.writeInt32(this._reMapRequestType(type)); this.writeInt32(this.mToken); if (!options) { @@ -190,6 +190,28 @@ BufObject.prototype = { onSendParcel: function(parcel) { postRILMessage(this.context.clientId, parcel); + }, + + /** + * Remapping the request type to different values based on RIL version. + * We only have to do this for SUBSCRIPTION right now, so I just make it + * simple. A generic logic or structure could be discussed if we have more + * use cases, especially the cases from different partners. + */ + _reMapRequestType: function(type) { + let newType = type; + switch (type) { + case REQUEST_SET_UICC_SUBSCRIPTION: + case REQUEST_SET_DATA_SUBSCRIPTION: + if (this.context.RIL.version < 9) { + // Shift the CAF's proprietary parcels. Please see + // https://www.codeaurora.org/cgit/quic/la/platform/hardware/ril/tree/include/telephony/ril.h?h=b2g_jb_3.2 + newType = type - 1; + } + break; + } + + return newType; } }; @@ -355,6 +377,10 @@ function RilObject(aContext) { RilObject.prototype = { context: null, + /** + * RIL version. + */ + version: null, v5Legacy: null, /** @@ -6746,8 +6772,6 @@ RilObject.prototype[REQUEST_SET_DATA_SUBSCRIPTION] = function REQUEST_SET_DATA_S } this.sendChromeMessage(options); }; -RilObject.prototype[REQUEST_GET_UICC_SUBSCRIPTION] = null; -RilObject.prototype[REQUEST_GET_DATA_SUBSCRIPTION] = null; RilObject.prototype[REQUEST_GET_UNLOCK_RETRY_COUNT] = function REQUEST_GET_UNLOCK_RETRY_COUNT(length, options) { options.success = (options.rilRequestError === 0); if (!options.success) { @@ -7094,10 +7118,10 @@ RilObject.prototype[UNSOLICITED_RIL_CONNECTED] = function UNSOLICITED_RIL_CONNEC return; } - let version = this.context.Buf.readInt32List()[0]; - this.v5Legacy = (version < 5); + this.version = this.context.Buf.readInt32List()[0]; + this.v5Legacy = (this.version < 5); if (DEBUG) { - this.context.debug("Detected RIL version " + version); + this.context.debug("Detected RIL version " + this.version); this.context.debug("this.v5Legacy is " + this.v5Legacy); } From a9771a72b1d67033fa646260ede91e6bc163b9cb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 19:36:58 -0700 Subject: [PATCH 09/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0e1be72efcd..8418e366eb0 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -127,7 +127,7 @@ - + From 14155f23b90a1d149682b16d91544bf0c446ef0e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 19:40:30 -0700 Subject: [PATCH 10/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/24dd6b2b813c Author: Sam Foster Desc: Merge pull request #23332 from sfoster/close-apps-task-manager-bug-1047143 Bug 1047143 - close aps entering task-manager, exitToApp to open/restore. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/f6b063ada354 Author: Sam Foster Desc: Bug 1047143 - close aps entering task-manager, exitToApp to open/restore * Fix assumption that home event means homescreen opens in SoundManager, * Remove appwillopen handler in AttentionScreen, applaunch will suffice * Also listen for search app's requestforeground event --- 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 8d9599a15bc..76c7bc29b97 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "147db68f9e1f8b1d31c59ba56c3cde57d53fcb3f", + "revision": "24dd6b2b813cafec058f8f30aacae78250355dd7", "repo_path": "/integration/gaia-central" } From 184786942c4c73c6604ba3181e463d085f0bdad7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 19:46:28 -0700 Subject: [PATCH 11/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 8418e366eb0..355825dd990 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index eff95919c73..d7ba5757ebe 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 52bc64f4970..9fa8edfae50 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 06d31002185..01e8c44d38e 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 eff95919c73..d7ba5757ebe 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 8432d1d169e..3592fee5883 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c09827e900f..c1cf33db31e 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 0598d496c2e..df381989206 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 813491b1d0d..83eb3ba7d5d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1dacedb4361..81ec7e01615 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 6aa54e605994a1d98cdcf499730def4158e8a2c5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 19:55:29 -0700 Subject: [PATCH 12/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/05cef0e1f2eb Author: Min-Zhong "John" Lu Desc: Merge pull request #23136 from mnjul/bug_1056514_keyboard_symbols_font Bug 1056514 - Make Keyboard-Symbols font file a system font file and cached. r=timdream,alivedise,yuren. f=mwu ======== https://hg.mozilla.org/integration/gaia-central/rev/69e224487e6b Author: John Lu [:mnjul] Desc: Bug 1056514 - Make Keyboard-Symbols font file a system font file and cached --- 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 76c7bc29b97..6f098fc68c7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "24dd6b2b813cafec058f8f30aacae78250355dd7", + "revision": "05cef0e1f2ebdfb74fce293797619b3dee519aa8", "repo_path": "/integration/gaia-central" } From f53619578bc87edc7e32ba0ad54e8ddc0bf2406a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 19:57:01 -0700 Subject: [PATCH 13/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 355825dd990..d06ce9b4f62 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d7ba5757ebe..a271e8790c9 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 9fa8edfae50..3a8ee368bed 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 01e8c44d38e..d5ab0cbd05e 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 d7ba5757ebe..a271e8790c9 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 3592fee5883..48fca9509bd 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c1cf33db31e..2a59c6f67ad 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 df381989206..0ee273dee21 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 83eb3ba7d5d..903ac94082b 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 81ec7e01615..f5d92626da5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3963710e55eccd5d6260309093e70ab20c8e0fd1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 20:40:32 -0700 Subject: [PATCH 14/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/73b225c7c662 Author: Sherman Chen Desc: Merge pull request #23255 from shamenchens/Bug1054943-ActionMenuButton Bug 1054943 - Update button css for action menu, r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/9a5459a6311b Author: Sherman Chen Desc: Bug 1054943 - Update button css for action menu --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6f098fc68c7..e9c93064dc8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "05cef0e1f2ebdfb74fce293797619b3dee519aa8", + "revision": "73b225c7c6625c8edaa89b16ec67a9eeb6f0c281", "repo_path": "/integration/gaia-central" } From d2dbb2a8736ae607388a49974e3b694a5732f239 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 20:46:32 -0700 Subject: [PATCH 15/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d06ce9b4f62..476d67f7e53 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a271e8790c9..8fd04d1a525 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 3a8ee368bed..cd9814c9945 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 d5ab0cbd05e..1b67f4c9c26 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 a271e8790c9..8fd04d1a525 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 48fca9509bd..f37316f3dfc 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 2a59c6f67ad..dd56e6e6324 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 0ee273dee21..e382d7c0c28 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 903ac94082b..d62482f5dce 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index f5d92626da5..2b5fdc4074a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2fce7c59ca941055058cdde771f74f31a1f9841e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 20:55:32 -0700 Subject: [PATCH 16/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e5d0c3912725 Author: Min-Zhong "John" Lu Desc: Merge pull request #23196 from mnjul/bug_1035619_keyboard_search_enter_icon Bug 1035619 : [Keyboard] Search input type to use search icon on Enter key. r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/d60170eb0212 Author: Bharad Desc: Bug 1035619 : [Keyboard] Search input type to use search icon on Enter key --- 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 e9c93064dc8..e477bfdd5a8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "73b225c7c6625c8edaa89b16ec67a9eeb6f0c281", + "revision": "e5d0c3912725e8963f0551dd5b118d761067b0d6", "repo_path": "/integration/gaia-central" } From 92daded1b936e49f959d05f1cd7f9649cfcd1377 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 21:01:29 -0700 Subject: [PATCH 17/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 476d67f7e53..ebdd80c253b 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 8fd04d1a525..68f777cba3c 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 cd9814c9945..af2f5e0e61a 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 1b67f4c9c26..ce643b9b852 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 8fd04d1a525..68f777cba3c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index f37316f3dfc..7a5dacb1647 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index dd56e6e6324..f7ff4ed5d5b 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 e382d7c0c28..2d47a4a8595 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d62482f5dce..b12fbd38ffe 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2b5fdc4074a..476a0e571a6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d50dc3e1ae177a5a08e1ddfe98b53082f5716a8f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 21:55:28 -0700 Subject: [PATCH 18/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/88cec5b078eb Author: Min-Zhong "John" Lu Desc: Merge pull request #22879 from mnjul/bug_1053613_lockscreen_pin_bckspc_lastrow_vertical_separator Bug 1053613 - Lockscreen PIN keypad: backspace key misaligned & wrong, vertical separators missing, last row too high. r=gweng ======== https://hg.mozilla.org/integration/gaia-central/rev/613fb9e29d20 Author: John Lu [:mnjul] Desc: Bug 1053613 - Lockscreen PIN keypad: backspace key misaligned & wrong, vertical separators missing, last row too high --- 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 e477bfdd5a8..9a11d0c87d5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e5d0c3912725e8963f0551dd5b118d761067b0d6", + "revision": "88cec5b078eb9eea1f1b2d94979e4a2ebc7a661c", "repo_path": "/integration/gaia-central" } From c014098b72a688a709d8099393ec4695c3ceb0f7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 22:02:41 -0700 Subject: [PATCH 19/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ebdd80c253b..d3eff748681 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 68f777cba3c..e8a25d15ead 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 af2f5e0e61a..bd806d20312 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 ce643b9b852..84f14dd5cd7 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 68f777cba3c..e8a25d15ead 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 7a5dacb1647..9d41b89153e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f7ff4ed5d5b..015eb799044 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 2d47a4a8595..3022591028a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b12fbd38ffe..ddce7b20c82 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 476a0e571a6..fe4b681e7ff 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 9458864b8a7b79efc5e4d17eb241cf2ff18bc931 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 23:55:33 -0700 Subject: [PATCH 20/54] Bumping gaia.json for 8 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3177a8da3157 Author: EragonJ Desc: Merge pull request #23299 from EragonJ/bug-1058369 Bug 1058369 - [Settings] Carrier labels of 'Sim Settings' in ... r=Arthur ======== https://hg.mozilla.org/integration/gaia-central/rev/3c5c735822bd Author: EragonJ Desc: Bug 1058369 - [Settings] Carrier labels of 'Sim Settings' in 'Messaging Settings' is very close to the border ======== https://hg.mozilla.org/integration/gaia-central/rev/ddafc4a35653 Author: dwi2 Desc: Merge pull request #23339 from dwi2/bug1055981 Bug 1055981 - fix typo in teardown of homescreen_launcher_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/050398d91d1b Author: Tzu-Lin Huang Desc: Bug 1055981 - fix typo in teardown of homescreen_launcher_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/bf7918a1ab38 Author: gasolin Desc: Merge pull request #23015 from gasolin/issue-964601 Bug 964601 - [Settings] Add usb transter panel, r=eragon,alive ======== https://hg.mozilla.org/integration/gaia-central/rev/b053b63ba9c6 Author: gasolin Desc: Bug 964601 - [Settings] Add usb transter panel - rename system storage to usb_storage - have split switch - have usb storage settings in storage_item ======== https://hg.mozilla.org/integration/gaia-central/rev/59264c4f24f7 Author: Yuren Ju Desc: Merge pull request #23305 from yurenju/log-write-content Bug 1022192 - Add more log for utils-xpc:writeContent() ======== https://hg.mozilla.org/integration/gaia-central/rev/593aaef3660c Author: Yuren Ju Desc: Bug 1022192 - Add more log for utils-xpc:writeContent() --- 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 9a11d0c87d5..55afd4cb224 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "88cec5b078eb9eea1f1b2d94979e4a2ebc7a661c", + "revision": "3177a8da3157456079fefecb87d3a344d3b2ebc6", "repo_path": "/integration/gaia-central" } From bd8b0b6e8ac4eb6f433b3b4e092c2b2470dd2e13 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 26 Aug 2014 23:57:04 -0700 Subject: [PATCH 21/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index d3eff748681..11294d4f486 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e8a25d15ead..0b3b39e59e7 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 bd806d20312..2f76a6a48ae 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 84f14dd5cd7..ee19b2c2bf7 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 e8a25d15ead..0b3b39e59e7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 9d41b89153e..d62ee8010f7 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 015eb799044..b1a280ece6b 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 3022591028a..c3bc57ceadf 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ddce7b20c82..56c05fbb7f2 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index fe4b681e7ff..2306093645b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c2e0b3685a00db86e2093fb4ea3213f6d092d902 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 00:10:30 -0700 Subject: [PATCH 22/54] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fbfb6288914b Author: BavarianTomcat Desc: Revert "Bug 1047143 - close aps entering task-manager, exitToApp to open/restore" for causing leaks on b2g-inbound This reverts commit 450be0707d124ad06f15cd0dda1dd03ce2051fa6. ======== https://hg.mozilla.org/integration/gaia-central/rev/e1c263804467 Author: gasolin Desc: Merge pull request #23341 from gasolin/issue-1059050 Bug 1059050 - fix jsdoc build errors, timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/e00b5c8b1c2d Author: gasolin Desc: Bug 1059050 - fix jsdoc build errors --- 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 55afd4cb224..7f98a8c7c84 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3177a8da3157456079fefecb87d3a344d3b2ebc6", + "revision": "fbfb6288914bcb279d78d83331f55ea1cc2e5400", "repo_path": "/integration/gaia-central" } From 67d8e18ce04dfdebfcb3cab271b596ebdc8c549e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 00:12:04 -0700 Subject: [PATCH 23/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 11294d4f486..9ff61e14056 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0b3b39e59e7..0eec0573c77 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 2f76a6a48ae..adafa878bb7 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 ee19b2c2bf7..8c0bbc91fc9 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 0b3b39e59e7..0eec0573c77 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d62ee8010f7..fdefcbef46a 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index b1a280ece6b..8d5baac699c 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 c3bc57ceadf..6f728d381e8 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 56c05fbb7f2..348714d9e7b 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2306093645b..2403ea9c4ea 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d2b74b9e21d3e98fda4ae57bec17061507f7ec93 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 00:40:28 -0700 Subject: [PATCH 24/54] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a96683469011 Author: Florin Strugariu Desc: Merge pull request #23306 from chirarobert/fix_delete_app Bug 1058427 - [v2.1] Fix test_homescreen_delete_app ======== https://hg.mozilla.org/integration/gaia-central/rev/3559a7d0b830 Author: Robert Chira Desc: Bug 1058427 - [v2.1] Fix test_homescreen_delete_app ======== https://hg.mozilla.org/integration/gaia-central/rev/b09da2eb29f4 Author: Amir Nissim Desc: Merge pull request #23078 from EverythingMe/1033641-create-offline Bug 1033641 - [Vertical Homescreen] [Collections] [SCR] Ability to create collection groups offline ======== https://hg.mozilla.org/integration/gaia-central/rev/b0d9c26134b9 Author: Amir Nissim Desc: Bug 1033641 - [Vertical Homescreen] [Collections] [SCR] Ability to create collection groups offline --- 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 7f98a8c7c84..b4929d27742 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "fbfb6288914bcb279d78d83331f55ea1cc2e5400", + "revision": "a9668346901159abd165453628f4114ed60432bb", "repo_path": "/integration/gaia-central" } From 5a38e435a0ab7802eae6ff72666ac96017ce6cb4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 00:46:32 -0700 Subject: [PATCH 25/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9ff61e14056..61b5d55d48e 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0eec0573c77..dcfec35a148 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 adafa878bb7..18828da1b56 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 8c0bbc91fc9..35952c6137a 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 0eec0573c77..dcfec35a148 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index fdefcbef46a..fd0bf48ed81 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8d5baac699c..81ba5be8fae 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 6f728d381e8..24c10becbb6 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 348714d9e7b..2fb4681f458 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2403ea9c4ea..74de2a155dc 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8b1887c16eb9f6a9ea9769fdeff565fcfd6811c7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 01:25:32 -0700 Subject: [PATCH 26/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f9552af54d2f Author: Sherman Chen Desc: Merge pull request #23142 from shamenchens/Bug1041313-SettingsButtons Bug 1041313 - Update css for settings buttons, r=arthur ======== https://hg.mozilla.org/integration/gaia-central/rev/52fecca226bb Author: Sherman Chen Desc: Bug 1041313 - Update css for settings buttons --- 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 b4929d27742..0b8d47b9e67 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "a9668346901159abd165453628f4114ed60432bb", + "revision": "f9552af54d2fa616277df223f0ce79d20884609e", "repo_path": "/integration/gaia-central" } From 0d255c84c72e31403cefd6cf0b77341dd7908654 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 01:31:31 -0700 Subject: [PATCH 27/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 61b5d55d48e..811beafbfb0 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index dcfec35a148..51977300716 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 18828da1b56..e7c1d0e4cca 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 35952c6137a..630f26f37b2 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 dcfec35a148..51977300716 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index fd0bf48ed81..10940b0eccc 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 81ba5be8fae..367ac08f59a 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 24c10becbb6..ebf779ec69a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 2fb4681f458..d14fd957c70 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 74de2a155dc..09ea0a30c7e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From a124e922f2d9ee93b8704fe31636cc1a7a7ecbbe Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 01:40:33 -0700 Subject: [PATCH 28/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/91ea180532b3 Author: Min-Zhong "John" Lu Desc: Merge pull request #23347 from mnjul/revert_1024298 Revert "Bug 1024298 - [Keyboard UX update] Show the full symbol panel for type="number"" ======== https://hg.mozilla.org/integration/gaia-central/rev/aa31b677183a Author: John Lu [:mnjul] Desc: Revert "Bug 1024298 - [Keyboard UX update] Show the full symbol panel for type="number"" This reverts commit 8763293e39d5121000c3b9b76b1583865442ae39. --- 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 0b8d47b9e67..21f71659fef 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f9552af54d2fa616277df223f0ce79d20884609e", + "revision": "91ea180532b34b61f38d1bf8333a021fc1ca5bc1", "repo_path": "/integration/gaia-central" } From 02664c3ce0ce28920f6e108cec1cf2813c7d52e8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 01:46:30 -0700 Subject: [PATCH 29/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 811beafbfb0..9dce2aa0353 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 51977300716..589e3278301 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 e7c1d0e4cca..4286f507dae 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 630f26f37b2..dd51e36498c 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 51977300716..589e3278301 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 10940b0eccc..fcdee0f5251 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 367ac08f59a..0a6b02793a7 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 ebf779ec69a..b3a1b7ca49c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d14fd957c70..6343a06b95d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 09ea0a30c7e..3242e4583d3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 19ab991b6316ed6896064e3a33c4ce316751a508 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 02:00:28 -0700 Subject: [PATCH 30/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/743e96bab0e3 Author: Min-Zhong "John" Lu Desc: Merge pull request #23342 from mnjul/bug_1059051_keyboard_symbols_ttf Bug 1059051 - Convert Keyboard-Symbols.woff to Keyboard-Symbols.ttf. r=yuren ======== https://hg.mozilla.org/integration/gaia-central/rev/8c41d39346a0 Author: John Lu [:mnjul] Desc: Bug 1059051 - Convert Keyboard-Symbols.woff to Keyboard-Symbols.ttf --- 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 21f71659fef..3c670b75e60 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "91ea180532b34b61f38d1bf8333a021fc1ca5bc1", + "revision": "743e96bab0e38e6da07a6604d40d9d2676b1fa11", "repo_path": "/integration/gaia-central" } From c6a07fe685eae8b400d4e1e91c24e9da677a1078 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 02:02:21 -0700 Subject: [PATCH 31/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9dce2aa0353..216467f09fa 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 589e3278301..683c7eb1d74 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 4286f507dae..4ee286376a8 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 dd51e36498c..493a2b94be6 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 589e3278301..683c7eb1d74 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index fcdee0f5251..c4fe0da6bcc 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0a6b02793a7..e7e0e204de5 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 b3a1b7ca49c..891027bd9aa 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 6343a06b95d..a858f02a343 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 3242e4583d3..fb6fe39c0f8 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3a60ef75d45ee6b89d45695971b2392323fa2bf1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 08:25:27 -0700 Subject: [PATCH 32/54] Bumping gaia.json for 12 gaia revision(s) a=gaia-bump Truncated some number of revisions since the previous bump. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/afc662a8f4d3 Author: Kevin Grandon Desc: Merge pull request #23338 from KevinGrandon/bug_1054521_retain_search_input_apps Bug 1054521 - [Rocketbar] Persist search term for non-browser launches ======== https://hg.mozilla.org/integration/gaia-central/rev/c9f8e763271f Author: Kevin Grandon Desc: Bug 1054521 - [Rocketbar] Persist search term for non-browser launches r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/4e45fce10968 Author: Yuren Ju Desc: Merge pull request #23368 from yurenju/fix-space-for-profile-rule Bug 1059239 - Use tab for $(PROFILE_FOLDER) rule in Makefile r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/c8ca6ae26554 Author: Yuren Ju Desc: Bug 1059239 - Use tab for $(PROFILE_FOLDER) rule in Makefile r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/93c8900ba248 Author: Yuren Ju Desc: Merge pull request #22996 from delta-nry/bug-1012568-fix Bug 1012568 - replace all tab to 2 spaces in Makefile except makefile ru... r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/e95d1b41fdb1 Author: Nathan Yee Desc: Bug 1012568 - replace all tab to 2 spaces in Makefile except makefile rules R=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/1d4124c5a0df Author: Yuren Ju Desc: Merge pull request #23257 from vikassy/travis_fold WIP: Bug 974809 - Using travis_fold for reading log easily r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/efd41c2ed93c Author: Vikas S Yaligar Desc: Bug 974809 - Using travis_fold for reading log easily ======== https://hg.mozilla.org/integration/gaia-central/rev/be9898a48ea0 Author: George Desc: Merge pull request #23355 from cctuan/1059142 Bug 1059142 - [Text selection] set hasCutOrCopied to false in pasteHandler ======== https://hg.mozilla.org/integration/gaia-central/rev/a3d92e5a633f Author: cctuan Desc: Bug 1059142 - [Text selection] set hasCutOrCopied to false in pasteHandler ======== https://hg.mozilla.org/integration/gaia-central/rev/f1ce9cf0bf36 Author: Fernando Rodríguez Sela Desc: Merge pull request #22880 from frsela/STK/Bug1026556 Bug 1026556 - Stk Timer Management Proactive Command error conditions not supported, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/4981baf172a2 Author: Fernando Rodriguez Sela Desc: Bug 1026556 - Stk Timer Management Proactive Command error conditions not supported --- 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 3c670b75e60..c639413e527 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "743e96bab0e38e6da07a6604d40d9d2676b1fa11", + "revision": "afc662a8f4d312224075b078f74e4be4046a913c", "repo_path": "/integration/gaia-central" } From 2d79ed6396732d30e28054ba68fe522e72f60119 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 08:29:12 -0700 Subject: [PATCH 33/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 216467f09fa..557f58507c1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 683c7eb1d74..a773094f702 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 4ee286376a8..69d47f8a88b 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 493a2b94be6..93087663688 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 683c7eb1d74..a773094f702 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index c4fe0da6bcc..4bf5efae0dd 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e7e0e204de5..ce75bade697 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 891027bd9aa..9ef4e3d0c00 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index a858f02a343..eee1537f3b7 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index fb6fe39c0f8..05a2a1c89db 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8663b49c362beb02f35c237bb9e2e3c87caefec3 Mon Sep 17 00:00:00 2001 From: Yoshi Huang Date: Wed, 27 Aug 2014 05:13:00 -0400 Subject: [PATCH 34/54] Bug 963541 - B2G NFC: Remove NFCTag.connect and NFCTag.close. r=smaug, r=dimi --- dom/nfc/nsNfc.js | 7 ------- dom/webidl/MozNFCTag.webidl | 3 --- 2 files changed, 10 deletions(-) diff --git a/dom/nfc/nsNfc.js b/dom/nfc/nsNfc.js index 085861a349b..91cb22d0aeb 100644 --- a/dom/nfc/nsNfc.js +++ b/dom/nfc/nsNfc.js @@ -72,13 +72,6 @@ MozNFCTag.prototype = { makeReadOnlyNDEF: function makeReadOnlyNDEF() { return this._nfcContentHelper.makeReadOnlyNDEF(this._window, this.session); }, - connect: function connect(enum_tech_type) { - let int_tech_type = this._techTypesMap[enum_tech_type]; - return this._nfcContentHelper.connect(this._window, int_tech_type, this.session); - }, - close: function close() { - return this._nfcContentHelper.close(this._window, this.session); - }, classID: Components.ID("{4e1e2e90-3137-11e3-aa6e-0800200c9a66}"), contractID: "@mozilla.org/nfc/NFCTag;1", diff --git a/dom/webidl/MozNFCTag.webidl b/dom/webidl/MozNFCTag.webidl index b8f09bcb3fd..dca36fbfa70 100644 --- a/dom/webidl/MozNFCTag.webidl +++ b/dom/webidl/MozNFCTag.webidl @@ -29,9 +29,6 @@ interface MozNFCTag { DOMRequest readNDEF(); DOMRequest writeNDEF(sequence records); DOMRequest makeReadOnlyNDEF(); - - DOMRequest connect(NFCTechType techType); - DOMRequest close(); }; // Mozilla Only From 0030236378ec1713c7e67a472f1749008f5fe220 Mon Sep 17 00:00:00 2001 From: Yoshi Huang Date: Fri, 22 Aug 2014 01:51:00 -0400 Subject: [PATCH 35/54] Bug 964194 - B2G NFC: Remove NFCTag.getDetailsNDEF(). r=smaug, r=dimi --- dom/nfc/nsNfc.js | 3 --- dom/webidl/MozNFCTag.webidl | 1 - 2 files changed, 4 deletions(-) diff --git a/dom/nfc/nsNfc.js b/dom/nfc/nsNfc.js index 91cb22d0aeb..907c11caf83 100644 --- a/dom/nfc/nsNfc.js +++ b/dom/nfc/nsNfc.js @@ -60,9 +60,6 @@ MozNFCTag.prototype = { _techTypesMap: null, // NFCTag interface: - getDetailsNDEF: function getDetailsNDEF() { - return this._nfcContentHelper.getDetailsNDEF(this._window, this.session); - }, readNDEF: function readNDEF() { return this._nfcContentHelper.readNDEF(this._window, this.session); }, diff --git a/dom/webidl/MozNFCTag.webidl b/dom/webidl/MozNFCTag.webidl index dca36fbfa70..f3e40475445 100644 --- a/dom/webidl/MozNFCTag.webidl +++ b/dom/webidl/MozNFCTag.webidl @@ -25,7 +25,6 @@ enum NFCTechType { [JSImplementation="@mozilla.org/nfc/NFCTag;1", AvailableIn="CertifiedApps"] interface MozNFCTag { - DOMRequest getDetailsNDEF(); DOMRequest readNDEF(); DOMRequest writeNDEF(sequence records); DOMRequest makeReadOnlyNDEF(); From eca129ad8ee660e8fddcc1792b8c3aaf9587589a Mon Sep 17 00:00:00 2001 From: Shawn Ku Date: Tue, 26 Aug 2014 10:13:01 +0800 Subject: [PATCH 36/54] Bug 1051664 - B2G RIL: Add marionette tests for EF_OPL wild char. r=Edgar --- .../test_mobile_operator_names_plmnlist.js | 50 +++++++++++++++++-- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js index 4bc12a1eacc..f6354ec437d 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_operator_names_plmnlist.js @@ -40,19 +40,26 @@ function test(aLongName, aShortName, aMcc, aMnc, aLac, aCid, startTestCommon(function() { /** - * In emulator we have pre-defined 4 PNN sets: + * In emulator we have pre-defined 7 EF_PNN (see 3GPP TS 31.102 clause 4.2.58) + * sets: * * PNN 1: Full name: "Test1", Short name: "Test1" * PNN 2: Full name: "Test2", Short name: (none) - * PNN 2: Full name: "Test3", Short name: (none) - * PNN 2: Full name: "Test4", Short name: (none) + * PNN 3: Full name: "Test3", Short name: (none) + * PNN 4: Full name: "Test4", Short name: (none) + * PNN 5: Full name: "Test5", Short name: (none) + * PNN 6: Full name: "Test6", Short name: (none) + * PNN 7: Full name: "Test7", Short name: (none) * - * Also 4 OPL sets: + * Also 7 EF_OPL (see 3GPP TS 31.102 clause 4.2.59) sets: * * MCC = 001, MNC = 01, START=0000, END=FFFE, PNN = 01, * MCC = 001, MNC = 02, START=0001, END=0010, PNN = 02, * MCC = 001, MNC = 03, START=0011, END=0011, PNN = 03, * MCC = 001, MNC = 001, START=0012, END=0012, PNN = 04, + * MCC = 001, MNC = 1D, START=0000, END=FFFE, PNN = 05, + * MCC = 001, MNC = 2DD, START=0000, END=FFFE, PNN = 06, + * MCC = 001, MNC = DDD, START=0000, END=FFFE, PNN = 07, * * See https://github.com/mozilla-b2g/platform_external_qemu/blob/master/telephony/sim_card.c#L725 */ @@ -107,6 +114,41 @@ startTestCommon(function() { .then(() => test("Foo1", "Bar1", "001", "001", 0x0012, TEST_CELL_ID, "Test4", "")) + // Wild char test for MCC = 001, MNC = 1D cases. + .then(() => test("Foo10", "Bar10", "001", "10", 0x0000, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo11", "Bar11", "001", "11", 0x0001, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo12", "Bar12", "001", "12", 0x0002, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo13", "Bar13", "001", "13", 0x0003, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo14", "Bar14", "001", "14", 0x0004, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo15", "Bar15", "001", "15", 0x0005, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo16", "Bar16", "001", "16", 0x0006, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo17", "Bar17", "001", "17", 0x0007, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo18", "Bar18", "001", "18", 0x0008, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo19", "Bar19", "001", "19", 0x0009, TEST_CELL_ID, + "Test5", "")) + .then(() => test("Foo20", "Bar20", "001", "20", 0x000A, TEST_CELL_ID)) + + // Wild chars test for MCC = 001, MNC = 2DD cases. + .then(() => test("Foo0", "Bar0", "001", "200", 0x00C8, TEST_CELL_ID, + "Test6", "")) + .then(() => test("Foo1", "Bar1", "001", "299", 0x012B, TEST_CELL_ID, + "Test6", "")) + + // Wild chars test for MCC = 001, MNC = DDD cases. + .then(() => test("Foo300", "Bar300", "001", "300", 0x012C, TEST_CELL_ID, + "Test7", "")) + .then(() => test("Foo999", "Bar999", "001", "999", 0x03E7, TEST_CELL_ID, + "Test7", "")) + // Reset back to initial values. .then(() => test(longName, shortName, mcc, mnc, lac, cid)); }); From de241adf7f2005fc4bf43ddaa84461816e3651b0 Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Wed, 27 Aug 2014 16:38:20 +0200 Subject: [PATCH 37/54] Bug 1040931 - Add extensionID parameter to addEngineWithDetails r=gavin --- .../base/public/nsIBrowserSearchService.idl | 8 +++++-- toolkit/components/search/nsSearchService.js | 22 ++++++++++++++++--- .../search/tests/xpcshell/data/search.json | 1 + .../search/tests/xpcshell/test_json_cache.js | 1 + 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/netwerk/base/public/nsIBrowserSearchService.idl b/netwerk/base/public/nsIBrowserSearchService.idl index a6ffb187fa1..577182bcf31 100644 --- a/netwerk/base/public/nsIBrowserSearchService.idl +++ b/netwerk/base/public/nsIBrowserSearchService.idl @@ -239,7 +239,7 @@ interface nsIBrowserSearchInitObserver : nsISupports void onInitComplete(in nsresult aStatus); }; -[scriptable, uuid(939d74a4-5b01-463c-80c7-4301f0c0f9ef)] +[scriptable, uuid(4a4ce87d-7cb9-4975-a267-345f6a49bb8f)] interface nsIBrowserSearchService : nsISupports { /** @@ -327,13 +327,17 @@ interface nsIBrowserSearchService : nsISupports * @param url * The URL to which search queries should be sent. * Must not be null. + * + * @param extensionID [optional] + * Optional: The correct extensionID if called by an add-on. */ void addEngineWithDetails(in AString name, in AString iconURL, in AString alias, in AString description, in AString method, - in AString url); + in AString url, + [optional] in AString extensionID); /** * Un-hides all engines installed in the directory corresponding to diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js index 4259763265c..db41233058c 100644 --- a/toolkit/components/search/nsSearchService.js +++ b/toolkit/components/search/nsSearchService.js @@ -1127,6 +1127,8 @@ Engine.prototype = { _iconUpdateURL: null, /* Deferred serialization task. */ _lazySerializeTask: null, + /* The extension ID if added by an extension. */ + _extensionID: null, /** * Retrieves the data from the engine's file. If the engine's dataType is @@ -1673,7 +1675,7 @@ Engine.prototype = { */ _initFromMetadata: function SRCH_ENG_initMetaData(aName, aIconURL, aAlias, aDescription, aMethod, - aTemplate) { + aTemplate, aExtensionID) { ENSURE_WARN(!this._readOnly, "Can't call _initFromMetaData on a readonly engine!", Cr.NS_ERROR_FAILURE); @@ -1684,6 +1686,7 @@ Engine.prototype = { this.alias = aAlias; this._description = aDescription; this._setIcon(aIconURL, true); + this._extensionID = aExtensionID; this._serializeToFile(); }, @@ -1861,6 +1864,9 @@ Engine.prototype = { case "IconUpdateUrl": this._iconUpdateURL = child.textContent; break; + case "ExtensionID": + this._extensionID = child.textContent; + breakk; } } if (!this.name || (this._urls.length == 0)) @@ -2205,6 +2211,9 @@ Engine.prototype = { this._readOnly = false; this._iconURI = makeURI(aJson._iconURL); this._iconMapObj = aJson._iconMapObj; + if (aJson.extensionID) { + this._extensionID = aJson.extensionID; + } for (let i = 0; i < aJson._urls.length; ++i) { let url = aJson._urls[i]; let engineURL = new EngineURL(url.type || URLTYPE_SEARCH_HTML, @@ -2256,6 +2265,9 @@ Engine.prototype = { json._dataType = this._dataType; if (!this._readOnly || !aFilter) json._readOnly = this._readOnly; + if (this._extensionID) { + json.extensionID = this._extensionID; + } return json; }, @@ -2301,6 +2313,10 @@ Engine.prototype = { appendTextNode(MOZSEARCH_NS_10, "IconUpdateUrl", this._iconUpdateURL); appendTextNode(MOZSEARCH_NS_10, "SearchForm", this._searchForm); + if (this._extensionID) { + appendTextNode(MOZSEARCH_NS_10, "ExtensionID", this._extensionID); + } + for (var i = 0; i < this._urls.length; ++i) this._urls[i]._serializeToElement(doc, docElem); docElem.appendChild(doc.createTextNode("\n")); @@ -3953,7 +3969,7 @@ SearchService.prototype = { addEngineWithDetails: function SRCH_SVC_addEWD(aName, aIconURL, aAlias, aDescription, aMethod, - aTemplate) { + aTemplate, aExtensionID) { this._ensureInitialized(); if (!aName) FAIL("Invalid name passed to addEngineWithDetails!"); @@ -3966,7 +3982,7 @@ SearchService.prototype = { var engine = new Engine(getSanitizedFile(aName), SEARCH_DATA_XML, false); engine._initFromMetadata(aName, aIconURL, aAlias, aDescription, - aMethod, aTemplate); + aMethod, aTemplate, aExtensionID); this._addEngineToStore(engine); }, diff --git a/toolkit/components/search/tests/xpcshell/data/search.json b/toolkit/components/search/tests/xpcshell/data/search.json index 19f125356a1..9d702bdd93f 100644 --- a/toolkit/components/search/tests/xpcshell/data/search.json +++ b/toolkit/components/search/tests/xpcshell/data/search.json @@ -11,6 +11,7 @@ "_name": "Test search engine", "_hidden": false, "description": "A test search engine (based on Google search)", + "extensionID": "test-addon-id@mozilla.org", "__searchForm": "http://www.google.com/", "_iconURL": "data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA", "_urls": [ diff --git a/toolkit/components/search/tests/xpcshell/test_json_cache.js b/toolkit/components/search/tests/xpcshell/test_json_cache.js index ea3457ae564..379cc88df1b 100644 --- a/toolkit/components/search/tests/xpcshell/test_json_cache.js +++ b/toolkit/components/search/tests/xpcshell/test_json_cache.js @@ -183,6 +183,7 @@ let EXPECTED_ENGINE = { searchForm: "http://www.google.com/", type: Ci.nsISearchEngine.TYPE_MOZSEARCH, wrappedJSObject: { + _extensionID: "test-addon-id@mozilla.org", "_iconURL": "data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA", _urls : [ { From 048303eddb61dd7a4ccf09b71b4d7bfd2018be2c Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 27 Aug 2014 11:34:46 -0400 Subject: [PATCH 38/54] Bug 1059175 - Bump the B2G leak threshold to 5116 bytes. rs=khuey, a=bustage --- testing/mochitest/mochitest_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/mochitest/mochitest_options.py b/testing/mochitest/mochitest_options.py index 62a63e5b31d..c0e6f1b783c 100644 --- a/testing/mochitest/mochitest_options.py +++ b/testing/mochitest/mochitest_options.py @@ -743,7 +743,7 @@ class B2GOptions(MochitestOptions): defaults["testPath"] = "" defaults["extensionsToExclude"] = ["specialpowers"] # See dependencies of bug 1038943. - defaults["leakThreshold"] = 5084 + defaults["leakThreshold"] = 5116 self.set_defaults(**defaults) def verifyRemoteOptions(self, options): From 3ad70813a42866e05dd212f281ea953ad0e456a3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 08:50:21 -0700 Subject: [PATCH 39/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cd88a192f630 Author: Ryan VanderMeulen Desc: Merge pull request #23351 from mozfreddyb/bug-1056882 Bug 1056882: no cross-origin imports, r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/838c05f35ed0 Author: Frederik B Desc: Bug 1056882: no cross-origin imports, r=kgrandon --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c639413e527..b39616f6b68 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "afc662a8f4d312224075b078f74e4be4046a913c", + "revision": "cd88a192f630e6e9fbafbd806b9f6bffbaf75205", "repo_path": "/integration/gaia-central" } From 0265dba939cb3d36fd4f4f8233bd4ca9eccbfd7c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 09:00:06 -0700 Subject: [PATCH 40/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 4 ++-- b2g/config/emulator-kk/sources.xml | 4 ++-- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 4 ++-- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 557f58507c1..e1b315f6025 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a773094f702..4724d669b68 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 69d47f8a88b..cb7b5e27ffe 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 93087663688..d159377e7c4 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + @@ -122,7 +122,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index a773094f702..4724d669b68 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 4bf5efae0dd..b294460d9f9 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ce75bade697..b635e9710f4 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 9ef4e3d0c00..991f09940ef 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index eee1537f3b7..a7700fd1f88 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 05a2a1c89db..e2aa499b433 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From a9656cc8992c82f5be08d8ee8db2e41658ee9f07 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 10:55:31 -0700 Subject: [PATCH 41/54] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ee84a16179e7 Author: Kevin Grandon Desc: Merge pull request #23378 from KevinGrandon/bug_1052503_progress_indicator_steps Bug 1052503 - [GaiaProgress] Try using keyframe steps ======== https://hg.mozilla.org/integration/gaia-central/rev/8a086b431433 Author: Kevin Grandon Desc: Bug 1052503 - [GaiaProgress] Try using keyframe steps r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/51714f1a762c Author: Ryan VanderMeulen Desc: Revert "Merge pull request #22880 from frsela/STK/Bug1026556" This reverts commit 66c5ef590b6fd75865fd215dc632c561afdeffc9, reversing changes made to 111257ab1d64cc4d27295de8b92fc553aedcc858. --- 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 b39616f6b68..297e753ba2e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "cd88a192f630e6e9fbafbd806b9f6bffbaf75205", + "revision": "ee84a16179e7abc593c9ac03cc75bf7265af2c2d", "repo_path": "/integration/gaia-central" } From 70bb5a8f6d4c77381b385a28289c960ceae5a7bb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 11:01:55 -0700 Subject: [PATCH 42/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index e1b315f6025..a8b7827d432 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4724d669b68..10fd88521f6 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 cb7b5e27ffe..acd365a1676 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 d159377e7c4..b0b2e787b00 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 4724d669b68..10fd88521f6 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index b294460d9f9..909025df08b 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index b635e9710f4..d2052e02060 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 991f09940ef..e34cb21b17d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index a7700fd1f88..0acb8ec5f0d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index e2aa499b433..13b9406aa03 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 161f7fe1fd086b1a00e23632d66decc63a767c4c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 11:17:06 -0700 Subject: [PATCH 43/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a8b7827d432..899193959c4 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 10fd88521f6..93f97fb7f12 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index acd365a1676..ff6e02be7c4 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b0b2e787b00..82fc3e3942d 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 10fd88521f6..93f97fb7f12 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -25,7 +25,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 909025df08b..85bf823b2f5 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index d2052e02060..6df46ade24d 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -22,7 +22,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 0acb8ec5f0d..521ff14a5fa 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 13b9406aa03..54b58e2a667 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -22,7 +22,7 @@ - + From b4c260186bda5e54b0f22a5b041dd5f4043767d9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 11:45:36 -0700 Subject: [PATCH 44/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ab65b087ead8 Author: Miller Medeiros Desc: Merge pull request #22697 from millermedeiros/1023662-5-day-week-view Bug 1023662 - [User story] Show 5 day week view r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/5801513c0326 Author: Miller Medeiros Desc: Bug 1023662 - [User story] Show 5 day week view --- 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 297e753ba2e..0bc23fb9f1a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ee84a16179e7abc593c9ac03cc75bf7265af2c2d", + "revision": "ab65b087ead8020b13e1d1b4acf30990eb3c9021", "repo_path": "/integration/gaia-central" } From 707be87dbf15089a9cd2ea02c5b69f2618c9ed3a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 11:47:17 -0700 Subject: [PATCH 45/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 899193959c4..933beb2c35e 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 93f97fb7f12..95fde336623 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 ff6e02be7c4..ae26ded8cef 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 82fc3e3942d..757fd51ad9f 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 93f97fb7f12..95fde336623 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 85bf823b2f5..b9fc1593d94 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 6df46ade24d..74d1e8fbd3c 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 e34cb21b17d..0ac7d961da3 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 521ff14a5fa..2ce14ac0fec 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 54b58e2a667..54ce798ae3e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 86ee025f381399837ce317cdfeaac147b2cadf58 Mon Sep 17 00:00:00 2001 From: Wes Johnston Date: Wed, 27 Aug 2014 12:06:17 -0700 Subject: [PATCH 46/54] Bug 1055012 - Verify sessions we're killed before starting load on Chromecast. r=mfinkle --- mobile/android/base/ChromeCast.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mobile/android/base/ChromeCast.java b/mobile/android/base/ChromeCast.java index 53be3a22921..476556a7df1 100644 --- a/mobile/android/base/ChromeCast.java +++ b/mobile/android/base/ChromeCast.java @@ -89,6 +89,9 @@ class ChromeCast implements GeckoMediaPlayer { remoteMediaPlayer.setOnStatusUpdatedListener(this); remoteMediaPlayer.setOnMetadataUpdatedListener(this); mSessionId = result.getSessionId(); + if (!verifySession(callback)) { + return; + } try { Cast.CastApi.setMessageReceivedCallbacks(apiClient, remoteMediaPlayer.getNamespace(), remoteMediaPlayer); From 031682e2b71ef404cfb62b1949fdc489c3763802 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 12:11:58 -0700 Subject: [PATCH 47/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 933beb2c35e..54d3a97c763 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -35,7 +35,7 @@ - + From b2e7541e17fe210b3385f11a0b8dfc1d5ae3f514 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Wed, 27 Aug 2014 12:15:30 -0700 Subject: [PATCH 48/54] Bug 1054929: Don't hand out stale fds from the TabChild cache. r=bent --- dom/ipc/TabChild.cpp | 2 ++ dom/ipc/TabParent.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 954f205a3ab..06c9a96ff8b 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -1532,6 +1532,8 @@ TabChild::DestroyWindow() runnable->Dispatch(); } } + + mCachedFileDescriptorInfos.Clear(); } void diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index d305a171779..a311f9a080f 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -149,7 +149,12 @@ private: FileDescriptor::PlatformHandleType handle = FileDescriptor::PlatformHandleType(PR_FileDesc2NativeHandle(mFD)); - mozilla::unused << tabParent->SendCacheFileDescriptor(mPath, FileDescriptor(handle)); + // Our TabParent may have been destroyed already. If so, don't send any + // fds over, just go back to the IO thread and close them. + if (!tabParent->IsDestroyed()) { + mozilla::unused << tabParent->SendCacheFileDescriptor(mPath, + FileDescriptor(handle)); + } nsCOMPtr eventTarget; mEventTarget.swap(eventTarget); From 1ddf019cef33d75c25322da8d4a182e3a05fc43d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 12:27:01 -0700 Subject: [PATCH 49/54] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ae26ded8cef..b6fc746ebb4 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -102,7 +102,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 757fd51ad9f..1b73a0b605c 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -122,7 +122,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 2ce14ac0fec..4b2dd6d63db 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -102,7 +102,7 @@ - + From 45fbef2e5d45421668932de5a078fa017b1c08ee Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 12:30:30 -0700 Subject: [PATCH 50/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cf1846cfb152 Author: James Burke Desc: Merge pull request #23049 from jrburke/bug1043533-email-account-settings-style Bug 1043533 - email UI: account settings styling r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/84cb6e14769a Author: jrburke Desc: Bug 1043533 - email UI: account settings styling --- 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 0bc23fb9f1a..4292bc84a30 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ab65b087ead8020b13e1d1b4acf30990eb3c9021", + "revision": "cf1846cfb1523ee35f630a7f82529bb42ae4ca4e", "repo_path": "/integration/gaia-central" } From c63aebcf29a84aedbc75e28b3fc55742879c3333 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 12:32:03 -0700 Subject: [PATCH 51/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 54d3a97c763..13b51db4c7e 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 95fde336623..32461bd8b5c 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 b6fc746ebb4..3c152d58df9 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 1b73a0b605c..6cd22f8ba50 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 95fde336623..32461bd8b5c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index b9fc1593d94..153313d8a55 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 74d1e8fbd3c..7f661e8ad30 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 0ac7d961da3..b9aa3a3f30b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 4b2dd6d63db..a47fd2ac43a 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 54ce798ae3e..9fab775c640 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 94896e11c510244cd5ec711577688bede2ebbe35 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 12:45:36 -0700 Subject: [PATCH 52/54] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d4afc0a7f72f Author: Justin D'Arcangelo Desc: Merge pull request #23329 from justindarc/bug1056096 Bug 1056096 - Camera preview stream is blurry on some hardware ======== https://hg.mozilla.org/integration/gaia-central/rev/2e1549a463a5 Author: Justin D'Arcangelo Desc: Bug 1056096 - Camera preview stream is blurry on some hardware --- 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 4292bc84a30..61099395eee 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "cf1846cfb1523ee35f630a7f82529bb42ae4ca4e", + "revision": "d4afc0a7f72fd7793359b9575ea7c90cd54e2348", "repo_path": "/integration/gaia-central" } From fa37e34e9603672669cea6be9600b97c1d09fe7b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 27 Aug 2014 12:51:29 -0700 Subject: [PATCH 53/54] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 13b51db4c7e..ad2b79e819c 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 32461bd8b5c..2cb1ae7bc9d 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 3c152d58df9..68c02c7ad20 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 6cd22f8ba50..9c3a62ebd1c 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 32461bd8b5c..2cb1ae7bc9d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 153313d8a55..9a46797b627 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 7f661e8ad30..e027a611e33 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 b9aa3a3f30b..729be0afff9 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index a47fd2ac43a..1b4c63e8bce 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 9fab775c640..27379571ba6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 786b92c99d4c46ad1820d8fad392bc0f93d74365 Mon Sep 17 00:00:00 2001 From: Monica Chew Date: Wed, 27 Aug 2014 14:13:04 -0700 Subject: [PATCH 54/54] Bug 1031033: String changes for tracking protection pref (r=adw) --- browser/locales/en-US/chrome/browser/preferences/privacy.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd index 0ac80a01d07..c7d2e517bce 100644 --- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -10,6 +10,9 @@ + + +