From 125b6cf7a7aea87dbe8b159f82a7e8d0364fa81d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 06:50:26 -0700 Subject: [PATCH 01/96] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9e2baca92a93 Author: Zac Desc: Bug 1027708 - test_homescreen_edit_mode.py intermittent due to unknown MacOS bug a=testonly r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/597b30f1e93f Author: Ben Francis Desc: Merge pull request #20742 from pivanov/bug-1026856 Bug 1026856 - [Flame][Browser] Icons in Tabs page should not be scaled while tapping it r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/be707c942358 Author: Pavel Ivanov Desc: Bug 1026856 - [Flame][Browser] Icons in Tabs page should not be scaled while tapping it --- 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 e7a0e56e13e7..3c8ece85a2b8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "387f4c0123a7e82eae4c83f88f73e81f907c00e2", + "revision": "9e2baca92a9316e1e3f8c659f01f2cc939714d46", "repo_path": "/integration/gaia-central" } From 20b85aa53541a3826062ff8951df577b8b708723 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 06:56:38 -0700 Subject: [PATCH 02/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index aff2cb8dff0a..b18babbed23a 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 2dc0b10b379c..6d6dcb5b8aa7 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 1606d1e2ebd9..24e28b1af1ba 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 aff2cb8dff0a..b18babbed23a 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 4a538c0e2c78..5beb0583e143 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 a523fba4f46e..8417a6aa5aeb 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 6df832fef0f5..967666fe8e6a 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 51213e7e1fb4..69fa6541f610 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 737c8b280696..bafb8aee8820 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 759ac947340dd108aa29d061a68f3527ac0f35ce Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 07:45:29 -0700 Subject: [PATCH 03/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1262a9127261 Author: Francisco Jordano Desc: Merge pull request #20780 from zbraniecki/1027480-new-entity-for-contacts-custom-tag Bug 1027480 - new l10n id for contact's custom tag ======== https://hg.mozilla.org/integration/gaia-central/rev/2dd90896a22f Author: Zbigniew Braniecki Desc: Bug 1027480 - new l10n id for contact's custom tag --- 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 3c8ece85a2b8..ecead255975e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9e2baca92a9316e1e3f8c659f01f2cc939714d46", + "revision": "1262a91272618ea996fbed6db19301fae5727a06", "repo_path": "/integration/gaia-central" } From 94c82c2a40fcd10098914e553e6ae32ce21dab3c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 07:51:38 -0700 Subject: [PATCH 04/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b18babbed23a..dfde4823d75b 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 6d6dcb5b8aa7..fe8bb79c273a 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 24e28b1af1ba..516e07aca428 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 b18babbed23a..dfde4823d75b 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 5beb0583e143..e61886b2ee7d 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 8417a6aa5aeb..04eaadf2d159 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 967666fe8e6a..f80e6a705c5e 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 69fa6541f610..cb0cff793fe4 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 bafb8aee8820..d8ea2f12de3e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 728125a6272642ab558edc83c499d6f8c73c87b0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 08:15:29 -0700 Subject: [PATCH 05/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4752a0a930d5 Author: Douglas Sherk Desc: Merge pull request #20316 from DouglasSherk/1022746-dialer-call-log-apzc Bug 1022746 - Remove requestAnimationFrame from FontSizeUtils to fix frames falling back to sync panning and zooming. r=vingtetun ======== https://hg.mozilla.org/integration/gaia-central/rev/67c31e91b752 Author: DouglasSherk Desc: Bug 1022746 - Remove requestAnimationFrame from FontSizeUtils to fix frames falling back to sync panning and zooming. r=vingtetun --- 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 ecead255975e..3b36c3e4cd2a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1262a91272618ea996fbed6db19301fae5727a06", + "revision": "4752a0a930d51fca56cb34d1ea69e4e369191b75", "repo_path": "/integration/gaia-central" } From 35b95be1f1e7dfb3ee99dba871d382da9ae0623d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 08:21:12 -0700 Subject: [PATCH 06/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index dfde4823d75b..fb377ed378b3 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 fe8bb79c273a..c8e33f190d06 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 516e07aca428..7984ec78c4eb 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 dfde4823d75b..fb377ed378b3 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 e61886b2ee7d..fdde967a7f8c 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 04eaadf2d159..437a65cb8ff3 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 f80e6a705c5e..484ebb78684d 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 cb0cff793fe4..16ea0e80c62e 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 d8ea2f12de3e..ceb69bb4740b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0881fbc6f53a83e5bf11fe2afacb2c381a4ef3b5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 08:35:25 -0700 Subject: [PATCH 07/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fe622e1ddef3 Author: Miller Medeiros Desc: Merge pull request #20766 from millermedeiros/1027349-month-weekday-single-char Bug 1027349 - [Calendar] month view week day names should be a single char r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/2061fbdeb8e2 Author: Miller Medeiros Desc: Bug 1027349 - [Calendar] month view week day names should be a single char --- 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 3b36c3e4cd2a..11a116399464 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4752a0a930d51fca56cb34d1ea69e4e369191b75", + "revision": "fe622e1ddef34bdef0918821b6a3e82afce8a72f", "repo_path": "/integration/gaia-central" } From b4c6be4ae83096086c10b1620e2d9f5b3110c738 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 08:36:44 -0700 Subject: [PATCH 08/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fb377ed378b3..250fc339ded0 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 c8e33f190d06..deb87813f101 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 7984ec78c4eb..a1d865a65f22 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 fb377ed378b3..250fc339ded0 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 fdde967a7f8c..3ab376652b31 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 437a65cb8ff3..0c3ad5f51518 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 484ebb78684d..e302d0ea008b 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 16ea0e80c62e..e59a59a22327 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 ceb69bb4740b..61e3a04fd1c8 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3c1c63a1879f328e330fb7ab7932803ea6dc82b3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 09:15:27 -0700 Subject: [PATCH 09/96] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1f0181cdf441 Author: Kevin Grandon Desc: Bug 1025963 - Edit mode follow-up r=me --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 11a116399464..ca81127e5b12 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "fe622e1ddef34bdef0918821b6a3e82afce8a72f", + "revision": "1f0181cdf4410ebcadecef0ab2abc0be1b5d2514", "repo_path": "/integration/gaia-central" } From 4d970f6b8da4d051e2bc0bb4c1286d6ef6fd41d9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 09:21:09 -0700 Subject: [PATCH 10/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 250fc339ded0..9b2f3e195d15 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 deb87813f101..2ef75896c519 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 a1d865a65f22..dfb63d0f95c8 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 250fc339ded0..9b2f3e195d15 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 3ab376652b31..9de6999a7682 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 0c3ad5f51518..67f28dc9ba50 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 e302d0ea008b..d4acda24f336 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 e59a59a22327..ff507b8ceb66 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 61e3a04fd1c8..af373512a3be 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7a449a382e5deab03ebb925bceb1241588c55ed5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 09:30:24 -0700 Subject: [PATCH 11/96] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d082fd16fd04 Author: Julien Wajsberg Desc: Bug 1027636 - [Messages] fix vcf media load in the mobile messaging mock r=azasypkin --- 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 ca81127e5b12..c5b748cc0847 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1f0181cdf4410ebcadecef0ab2abc0be1b5d2514", + "revision": "d082fd16fd04915b3eccbad8e7e89c1f9409608e", "repo_path": "/integration/gaia-central" } From ecad7e7f4ac8931ab8c23bf97b7e8bb0ef8b3f93 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 09:31:45 -0700 Subject: [PATCH 12/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9b2f3e195d15..715bbbc2d06e 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 2ef75896c519..939c67755aae 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 dfb63d0f95c8..4ffa2b269485 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 9b2f3e195d15..715bbbc2d06e 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 9de6999a7682..2f0134a9805a 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 67f28dc9ba50..7ebc7b032017 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 d4acda24f336..82d3b9e8adaf 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 ff507b8ceb66..c85b79291023 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 af373512a3be..ba30b04a8d48 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From cd07476e60587abe871a125cb52fc45587ee2243 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 11:25:24 -0700 Subject: [PATCH 13/96] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e0f2806a137e Author: Jared Hirsch Desc: Merge pull request #20385 from guilherme-pg/bug1022992-settings-panel Bug 1022992 - Always display Find My Device's enabled status in the Settings menu. ======== https://hg.mozilla.org/integration/gaia-central/rev/e4e679dd5cbe Author: Guilherme Goncalves Desc: Bug 1022992 - Always show Find My Device's enabled state in the root Settings menu. ======== https://hg.mozilla.org/integration/gaia-central/rev/3d02f57d6369 Author: Jared Hirsch Desc: Merge pull request #20626 from guilherme-pg/bug1025193-accept Bug 1025193 - Send a list of accepted commands when registering for Find... ======== https://hg.mozilla.org/integration/gaia-central/rev/fdf23be090c3 Author: Guilherme Goncalves Desc: Bug 1025193 - Send a list of accepted commands when registering for Find My Device. ======== https://hg.mozilla.org/integration/gaia-central/rev/8836b59700ad Author: Marcus Cavanaugh Desc: Merge pull request #20708 from mcav/clock-perf-5 Bug 1015386 - [Clock] Implement new startup loading events. r=hub ======== https://hg.mozilla.org/integration/gaia-central/rev/78da124e6f41 Author: Marcus Cavanaugh Desc: Bug 1015386 - [Clock] Implement new startup loading events. --- 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 c5b748cc0847..99803850ad2e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d082fd16fd04915b3eccbad8e7e89c1f9409608e", + "revision": "e0f2806a137e14b5040bf96011e6a1637df56013", "repo_path": "/integration/gaia-central" } From 1a9c194730b55c1f563623b0e93dd83af0068408 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 11:31:37 -0700 Subject: [PATCH 14/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 715bbbc2d06e..288c3d0a651a 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 939c67755aae..bd8365f29ec3 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 4ffa2b269485..3bc5ba4fab2f 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 715bbbc2d06e..288c3d0a651a 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 2f0134a9805a..ca2153240077 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 7ebc7b032017..958e222bbfa4 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 82d3b9e8adaf..7af1e30dca7d 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 c85b79291023..8f93dca2c8b8 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 ba30b04a8d48..cede41104c10 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From a0f907e5ba91037425beda05c2b52233b0e9d638 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 11:50:26 -0700 Subject: [PATCH 15/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9ff892729a0f Author: Jared Hirsch Desc: Merge pull request #20707 from guilherme-pg/bug1023419-unify-sign-up-text Bug 1023419 - Unify strings in Firefox Accounts and Find my device. r=gg... ======== https://hg.mozilla.org/integration/gaia-central/rev/438e82048820 Author: Nikhil Marathe Desc: Bug 1023419 - Unify strings in Firefox Accounts and Find my device. r=ggp --- 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 99803850ad2e..c2b4ee39afc2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e0f2806a137e14b5040bf96011e6a1637df56013", + "revision": "9ff892729a0ff028c96d5d39b9006fa4f7d71611", "repo_path": "/integration/gaia-central" } From d63288a04d46d8dcc94abb97cd2c47f663590677 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 11:56:39 -0700 Subject: [PATCH 16/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 288c3d0a651a..52071e75a632 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 bd8365f29ec3..b1742cde70d9 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 3bc5ba4fab2f..d71bf72f336e 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 288c3d0a651a..52071e75a632 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 ca2153240077..d30f240fb54c 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 958e222bbfa4..20292a00b569 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 7af1e30dca7d..71159ec3d016 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 8f93dca2c8b8..1811fdd8da98 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 cede41104c10..0fc0494afb52 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0b0825eaed58525dfd2aac9b04a8db9576dad577 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 12:05:25 -0700 Subject: [PATCH 17/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0e1a7ff7723d Author: Zibi Braniecki Desc: Merge pull request #20670 from flodolo/bug983547 Bug 983547 - [system] Localize "System update" correctly in update notice after switching language. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/3f9694069b87 Author: Francesco Lodolo (:flod) Desc: Bug 983547 - [system] Localize "System update" correctly in update notice after switching language --- 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 c2b4ee39afc2..14eb56b3f398 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9ff892729a0ff028c96d5d39b9006fa4f7d71611", + "revision": "0e1a7ff7723dbd44e973d2da8ebf5912bb12732a", "repo_path": "/integration/gaia-central" } From 82a5f17bdbbd519b97f55c404347b0411760eb39 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 12:11:45 -0700 Subject: [PATCH 18/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 52071e75a632..0f345cfd4336 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 b1742cde70d9..ad4146d33c7c 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 d71bf72f336e..ad2d3fdf4214 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 52071e75a632..0f345cfd4336 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 d30f240fb54c..c79852091a1c 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 20292a00b569..69361c5d7e8b 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 71159ec3d016..598be4579e1c 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 1811fdd8da98..cfccbefb491f 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 0fc0494afb52..aa5e12ef33a6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8a720b9b300e00c63af9817839e45d68cdf0ff0d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 13:15:29 -0700 Subject: [PATCH 19/96] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/048c50ecdf54 Author: Kevin Grandon Desc: Merge pull request #20815 from KevinGrandon/bug_1028311_collection_update_init_pinned_structure Bug 1028311 - Update initial structure for pinned results in collections ======== https://hg.mozilla.org/integration/gaia-central/rev/12a3c0bf9920 Author: Kevin Grandon Desc: Bug 1028311 - Update initial structure for pinned results in collections r=lightsofapollo ======== https://hg.mozilla.org/integration/gaia-central/rev/bc30e2b4d6bc Author: Kevin Grandon Desc: Merge pull request #20808 from KevinGrandon/bug_1028087_collection_population_from_apps Bug 1028087 - [Collection] Population task for app install/uninstall ======== https://hg.mozilla.org/integration/gaia-central/rev/7355f686ea55 Author: Kevin Grandon Desc: Bug 1028087 - [Collection] Population task for app install/uninstall 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 14eb56b3f398..8521629a7deb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "0e1a7ff7723dbd44e973d2da8ebf5912bb12732a", + "revision": "048c50ecdf542bc210fb62e65fadea95e2bac395", "repo_path": "/integration/gaia-central" } From fbad4fc98ecce8ff572b6911c519cd01fafafa60 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 13:21:14 -0700 Subject: [PATCH 20/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0f345cfd4336..bb1a5ebf09ee 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 ad4146d33c7c..80aebb48dc93 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 ad2d3fdf4214..b98e809fa56a 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 0f345cfd4336..bb1a5ebf09ee 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 c79852091a1c..a7894983982f 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 69361c5d7e8b..647277eda102 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 598be4579e1c..6e2350acab36 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 cfccbefb491f..722c07e02367 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 aa5e12ef33a6..ebe8d23f7515 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 785582fc9d124f5f4a65dc70975918d393fb2d0a Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Fri, 20 Jun 2014 17:06:36 -0400 Subject: [PATCH 21/96] Bug 1024728 - Gracefully handle a CrossProcessMutex being initialized with a stale handle. r=khuey --- ipc/glue/CrossProcessMutex_posix.cpp | 41 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/ipc/glue/CrossProcessMutex_posix.cpp b/ipc/glue/CrossProcessMutex_posix.cpp index 25987800e819..8e6199b56e84 100644 --- a/ipc/glue/CrossProcessMutex_posix.cpp +++ b/ipc/glue/CrossProcessMutex_posix.cpp @@ -19,6 +19,24 @@ struct MutexData { namespace mozilla { +static void +InitMutex(pthread_mutex_t* mMutex) +{ + pthread_mutexattr_t mutexAttributes; + pthread_mutexattr_init(&mutexAttributes); + // Make the mutex reentrant so it behaves the same as a win32 mutex + if (pthread_mutexattr_settype(&mutexAttributes, PTHREAD_MUTEX_RECURSIVE)) { + MOZ_CRASH(); + } + if (pthread_mutexattr_setpshared(&mutexAttributes, PTHREAD_PROCESS_SHARED)) { + MOZ_CRASH(); + } + + if (pthread_mutex_init(mMutex, &mutexAttributes)) { + MOZ_CRASH(); + } +} + CrossProcessMutex::CrossProcessMutex(const char*) : mSharedBuffer(nullptr) , mMutex(nullptr) @@ -43,20 +61,7 @@ CrossProcessMutex::CrossProcessMutex(const char*) mCount = &(data->mCount); *mCount = 1; - - pthread_mutexattr_t mutexAttributes; - pthread_mutexattr_init(&mutexAttributes); - // Make the mutex reentrant so it behaves the same as a win32 mutex - if (pthread_mutexattr_settype(&mutexAttributes, PTHREAD_MUTEX_RECURSIVE)) { - MOZ_CRASH(); - } - if (pthread_mutexattr_setpshared(&mutexAttributes, PTHREAD_PROCESS_SHARED)) { - MOZ_CRASH(); - } - - if (pthread_mutex_init(mMutex, &mutexAttributes)) { - MOZ_CRASH(); - } + InitMutex(mMutex); MOZ_COUNT_CTOR(CrossProcessMutex); } @@ -84,7 +89,13 @@ CrossProcessMutex::CrossProcessMutex(CrossProcessMutexHandle aHandle) mMutex = &(data->mMutex); mCount = &(data->mCount); - (*mCount)++; + int32_t count = (*mCount)++; + + if (count == 0) { + // The other side has already let go of their CrossProcessMutex, so now + // mMutex is garbage. We need to re-initialize it. + InitMutex(mMutex); + } MOZ_COUNT_CTOR(CrossProcessMutex); } From 1cd30b9355ed557d9bc59acc4b404da9428e05b4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 14:40:27 -0700 Subject: [PATCH 22/96] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e568fde51071 Author: Kevin Grandon Desc: Merge pull request #20805 from KevinGrandon/bug_1027005_collection_triggers Bug 1027005 - [Collection] Population task for new collections ======== https://hg.mozilla.org/integration/gaia-central/rev/c4b2eacc8672 Author: Kevin Grandon Desc: Bug 1027005 - [Collection] Population task for new collections r=daleharvey ======== https://hg.mozilla.org/integration/gaia-central/rev/58f3dccd99ab Author: Kevin Grandon Desc: Merge pull request #20819 from KevinGrandon/bug_1028351_vertical_manifest_localization Bug 1028351 - [Vertical] Vertical App name should be localized ======== https://hg.mozilla.org/integration/gaia-central/rev/932a62a49900 Author: Kevin Grandon Desc: Bug 1028351 - [Vertical] Vertical App name should be localized r=tchevalier r=lightsofapollo --- 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 8521629a7deb..2c8973e03b70 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "048c50ecdf542bc210fb62e65fadea95e2bac395", + "revision": "e568fde510714432ffb46ec1a66cda16b978c061", "repo_path": "/integration/gaia-central" } From e48b85b8bc5019d5ddd57c002a277946bd58173a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 14:46:26 -0700 Subject: [PATCH 23/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index bb1a5ebf09ee..55c425f7adbb 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 80aebb48dc93..c2aaf76fae5a 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 b98e809fa56a..caad163ba833 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 bb1a5ebf09ee..55c425f7adbb 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 a7894983982f..acf44e3f0510 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 647277eda102..2925760405e6 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 6e2350acab36..e78be9b8ea9e 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 722c07e02367..21c853e3f57c 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 ebe8d23f7515..d5af9ecc9064 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From fe5dde08d3acc85d8336554eccb4404fb8b43cff Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 15:10:25 -0700 Subject: [PATCH 24/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/14ddf1cf578c Author: Gareth Aye Desc: Merge pull request #20816 from gaye/bug-1027717-volo Bug 1027717 - Use package manager in calendar r=millermedeiros ======== https://hg.mozilla.org/integration/gaia-central/rev/a5d7ad7a9cbd Author: gaye Desc: Bug 1027717 - Use package manager in calendar --- 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 2c8973e03b70..664e83625215 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e568fde510714432ffb46ec1a66cda16b978c061", + "revision": "14ddf1cf578c67b0ce7999dffaabbbce3663de7e", "repo_path": "/integration/gaia-central" } From 1288ff59c4867ba37cbf1c91aeb0012d15aba7ee Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 15:11:46 -0700 Subject: [PATCH 25/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 55c425f7adbb..c2c098a7108c 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 c2aaf76fae5a..f87bde28ae35 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 caad163ba833..9ed0c1ec692f 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 55c425f7adbb..c2c098a7108c 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 acf44e3f0510..1eb15df0c60c 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 2925760405e6..3298d00a4c38 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 e78be9b8ea9e..12a310e4b9ae 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 21c853e3f57c..1dfc1f03ab6b 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 d5af9ecc9064..0f15f1f9e419 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d79fec32fc5f12c43336899532f1080dc2b17815 Mon Sep 17 00:00:00 2001 From: James Lal Date: Sat, 21 Jun 2014 01:32:15 +0200 Subject: [PATCH 26/96] Bug 1027458 - Correctly cleanup after canceling a mozapp download. r=fabrice --- dom/apps/src/Webapps.jsm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm index df0d05f20e78..877ab1ff237c 100755 --- a/dom/apps/src/Webapps.jsm +++ b/dom/apps/src/Webapps.jsm @@ -1316,6 +1316,12 @@ this.DOMApplicationRegistry = { return; } + // Ensure we don't send additional errors for this download + app.isCanceling = true; + + // Ensure this app can be downloaded again after canceling + app.downloading = false; + this._saveApps().then(() => { this.broadcastMessage("Webapps:UpdateState", { app: { @@ -1339,6 +1345,7 @@ this.DOMApplicationRegistry = { let id = this._appIdForManifestURL(aManifestURL); let app = this.webapps[id]; + if (!app) { debug("startDownload: No app found for " + aManifestURL); throw new Error("NO_SUCH_APP"); @@ -2770,6 +2777,14 @@ this.DOMApplicationRegistry = { // initialize the progress to 0 right now oldApp.progress = 0; + // Save the current state of the app to handle cases where we may be + // retrying a past download. + yield DOMApplicationRegistry._saveApps(); + DOMApplicationRegistry.broadcastMessage("Webapps:UpdateState", { + app: oldApp, + manifestURL: aNewApp.manifestURL + }); + let zipFile = yield this._getPackage(requestChannel, id, oldApp, aNewApp); let hash = yield this._computeFileHash(zipFile.path); @@ -4083,6 +4098,15 @@ AppcacheObserver.prototype = { let setError = function appObs_setError(aError) { debug("Offlinecache setError to " + aError); app.downloading = false; + mustSave = true; + + // If we are canceling the download, we already send a DOWNLOAD_CANCELED + // error. + if (app.isCanceling) { + delete app.isCanceling; + return; + } + DOMApplicationRegistry.broadcastMessage("Webapps:UpdateState", { app: app, error: aError, @@ -4092,7 +4116,6 @@ AppcacheObserver.prototype = { eventType: "downloaderror", manifestURL: app.manifestURL }); - mustSave = true; } switch (aState) { From 560c9379f6e2c970dfc7c0e5d076f4ceffa401da Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 16:35:28 -0700 Subject: [PATCH 27/96] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ec308b8ac579 Author: Kevin Grandon Desc: Revert "Bug 1028351 - [Vertical] Vertical App name should be localized r=tchevalier r=lightsofapollo" This reverts commit 8abd97917689c27041cc536930cac06e58715db5. --- 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 664e83625215..e6f1a6bbb33d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "14ddf1cf578c67b0ce7999dffaabbbce3663de7e", + "revision": "ec308b8ac5790ddcc732cbd101532019d1bc1821", "repo_path": "/integration/gaia-central" } From 8be4dfe7a61fc7fa93d4c758f11ac712ad0bf9cc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 16:41:17 -0700 Subject: [PATCH 28/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c2c098a7108c..35dc3ea48193 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 f87bde28ae35..7003aed55190 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 9ed0c1ec692f..c5b04a54ccfe 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 c2c098a7108c..35dc3ea48193 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 1eb15df0c60c..3ad931df253f 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 3298d00a4c38..4bcd8b08a526 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 12a310e4b9ae..71813cebcf0f 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 1dfc1f03ab6b..9ed51a4cd83d 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 0f15f1f9e419..b021ef6a99fd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3893941f2defb287585121f50c7f7c2038d1c321 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 18:15:29 -0700 Subject: [PATCH 29/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d801580839ab Author: Jared Hirsch Desc: Merge pull request #20834 from 6a68/revert-bug-1023419 Revert "Bug 1023419 - Unify strings in Firefox Accounts and Find my devi... ======== https://hg.mozilla.org/integration/gaia-central/rev/29a0a3223669 Author: Jared Hirsch Desc: Revert "Bug 1023419 - Unify strings in Firefox Accounts and Find my device. r=ggp" This reverts commit 2f77e2686dcd3964498eaca68b244dc6df8c7bf2. --- 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 e6f1a6bbb33d..e294ce970c4d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ec308b8ac5790ddcc732cbd101532019d1bc1821", + "revision": "d801580839abd7acb22c9479a14f9481bbcde757", "repo_path": "/integration/gaia-central" } From cb2a5454591b1fb285598d719e98c7a944acc31f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 18:21:17 -0700 Subject: [PATCH 30/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 35dc3ea48193..b73386112b3f 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 7003aed55190..6eb5c4a76dbd 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 c5b04a54ccfe..4a0d0ac6fb6b 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 35dc3ea48193..b73386112b3f 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 3ad931df253f..36fa8d4d4a38 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 4bcd8b08a526..a25274a83baf 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 71813cebcf0f..087c928d3f77 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 9ed51a4cd83d..45dca0f0204d 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 b021ef6a99fd..0939bf2afd68 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 1dd0d5c731c1eb9a6522b2f660c472dd4e4f8a1f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 18:55:25 -0700 Subject: [PATCH 31/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f2520364a26a Author: Kevin Grandon Desc: Merge pull request #20831 from KevinGrandon/bug_1028351_take_2 Bug 1028351 - [Vertical] Vertical App name should be localized ======== https://hg.mozilla.org/integration/gaia-central/rev/b3bdc20fe1dc Author: Kevin Grandon Desc: Bug 1028351 - [Vertical] Vertical App name should be localized r=tchevalier r=lightsofapollo --- 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 e294ce970c4d..38c54ec9c47a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d801580839abd7acb22c9479a14f9481bbcde757", + "revision": "f2520364a26a9cd32b3e7f7c2452139880de5938", "repo_path": "/integration/gaia-central" } From 0c6943f62c7e17bad12f5e628cc4016078b021fe Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 19:02:40 -0700 Subject: [PATCH 32/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b73386112b3f..488e679fbc5c 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 6eb5c4a76dbd..82d355514fe6 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 4a0d0ac6fb6b..7cdbeebf7277 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 b73386112b3f..488e679fbc5c 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 36fa8d4d4a38..ef75dfcc6927 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 a25274a83baf..39b3f1fd8aca 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 087c928d3f77..d88b23931b90 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 45dca0f0204d..ef9a31cfbcf5 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 0939bf2afd68..b1a929c7f92b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8214ac234daf0077caf89302e4f3bd0f2cc845f3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 19:10:26 -0700 Subject: [PATCH 33/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/aebbefb8569c Author: Kevin Grandon Desc: Merge pull request #20838 from daleharvey/1025854 Bug 1025854 - Remove invalid test. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/6eb0bb2a4561 Author: Dale Harvey Desc: Bug 1025854 - Remove invalid test. 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 38c54ec9c47a..53e5fe22241a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f2520364a26a9cd32b3e7f7c2452139880de5938", + "revision": "aebbefb8569ccb025fc3ebda5ecfa8f0d5e695f7", "repo_path": "/integration/gaia-central" } From b84a163d147e8f92382c658c040f0fe57b9034df Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 19:17:22 -0700 Subject: [PATCH 34/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 488e679fbc5c..6dd135b5833e 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 82d355514fe6..d1c84ef39d90 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 7cdbeebf7277..ff5376316b86 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 488e679fbc5c..6dd135b5833e 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 ef75dfcc6927..c369bc8734e2 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 39b3f1fd8aca..a27e35ce0561 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 d88b23931b90..0e59b58ad42a 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 ef9a31cfbcf5..ab932427c1f0 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 b1a929c7f92b..aaa65d5f5b63 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 23ffa83e26702a73dd1ae32d0ca3f384f041c034 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 19:25:25 -0700 Subject: [PATCH 35/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ce1a66a53fed Author: Kevin Grandon Desc: Merge pull request #20798 from KevinGrandon/Cwiiis-bug991460-squashed Bug 991460 - Allow adding apps to collections in verticalhome. ======== https://hg.mozilla.org/integration/gaia-central/rev/219fa13bcceb Author: Chris Lord Desc: Bug 991460 - Allow adding apps to collections in verticalhome. r=kgrandon - Make consts in grid_dragdrop upper case. - Add a 'hovered' class to icons being hovered over in GaiaGrid - Add a 'collection' class to collections in a GaiaGrid - Add a larger rearrange delay when hovering over a collection - Add a pulsing animation to collections when they're hovered over - Add hook to drop icons into collections - Add IAC to add apps to collections --- 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 53e5fe22241a..a52cdacbdb01 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "aebbefb8569ccb025fc3ebda5ecfa8f0d5e695f7", + "revision": "ce1a66a53fed1830b1bf757eb33d2a2fdf9e5ded", "repo_path": "/integration/gaia-central" } From 912f50dbc720af96b654c3bedf92388ca051569d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 19:31:45 -0700 Subject: [PATCH 36/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6dd135b5833e..a13bb8f88164 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 d1c84ef39d90..c8c2a073a48e 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 ff5376316b86..2ad0dbcf1e9c 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 6dd135b5833e..a13bb8f88164 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 c369bc8734e2..03c1c854a890 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 a27e35ce0561..c5c3c17762a1 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 0e59b58ad42a..f0cc27c3d203 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 ab932427c1f0..c21308cddf2e 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 aaa65d5f5b63..ea9bfb3afd9d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From eed2fc6e1987ca0764b8a56d9e64e4330d866253 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 19:50:25 -0700 Subject: [PATCH 37/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f67ed69cb1af Author: Kevin Grandon Desc: Merge pull request #20822 from KevinGrandon/bug_1016227_collection_image Bug 1016227 - [Collection] Update icon when apps or background changes ======== https://hg.mozilla.org/integration/gaia-central/rev/55ab0509da79 Author: Kevin Grandon Desc: Bug 1016227 - [Collection] Update icon when apps or background changes r=daleharvey --- 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 a52cdacbdb01..dad9b910888f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ce1a66a53fed1830b1bf757eb33d2a2fdf9e5ded", + "revision": "f67ed69cb1aff0207537aaf525b7d61efa44aa49", "repo_path": "/integration/gaia-central" } From 50c8891015547dd3b32f4d1bd2a047c552059268 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 19:51:45 -0700 Subject: [PATCH 38/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a13bb8f88164..60846926db7b 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 c8c2a073a48e..cd65d37804f0 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 2ad0dbcf1e9c..77523a2fa9e9 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 a13bb8f88164..60846926db7b 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 03c1c854a890..fc942015feea 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 c5c3c17762a1..368773be580d 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 f0cc27c3d203..3a61ff0c5e1f 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 c21308cddf2e..63b180509a62 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 ea9bfb3afd9d..aa95d6cc0097 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From f1c6d443a72018e3a279ad058c43d78c488f9628 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 21:30:26 -0700 Subject: [PATCH 39/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e98ca5ade44b Author: Kevin Grandon Desc: Merge pull request #20840 from KevinGrandon/lightsofapollo-visual-refresh Bug 1023950 - Implement real state handling for mozApps and apply visuals ======== https://hg.mozilla.org/integration/gaia-central/rev/a14217602a9a Author: James Lal Desc: Bug 1023950 - Implement real state handling for mozApps and apply visuals 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 dad9b910888f..73104d1e0fba 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f67ed69cb1aff0207537aaf525b7d61efa44aa49", + "revision": "e98ca5ade44b10e4988e7c82f4e68fc267e2b21d", "repo_path": "/integration/gaia-central" } From 6f57c41483dba36b8e05a803c395ba306c708019 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Jun 2014 21:36:38 -0700 Subject: [PATCH 40/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 60846926db7b..a5f6aea7b2e4 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 cd65d37804f0..db68110db653 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 77523a2fa9e9..0b4e46a69ead 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 60846926db7b..a5f6aea7b2e4 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 fc942015feea..cae61f1b5eb5 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 368773be580d..48f252c7dddc 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 3a61ff0c5e1f..a6b532922da0 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 63b180509a62..3925d4480457 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 aa95d6cc0097..f025007ccae6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2228ed40fa789a9b4260d7b3a9a0c77c6f55e033 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 02:50:26 -0700 Subject: [PATCH 41/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b4915d85ad52 Author: Aleh Zasypkin Desc: Merge pull request #20797 from azasypkin/bug-1012663-csp-compliance-back Bug 1012663 - [SMS] Remove inline style for CSP compliance. r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/738c3159ec5e Author: Aleh Zasypkin Desc: Bug 1012663 - [SMS] Remove inline style for CSP compliance. r=julienw --- 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 73104d1e0fba..9ac17e6f68e7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e98ca5ade44b10e4988e7c82f4e68fc267e2b21d", + "revision": "b4915d85ad52f5bdc4cc55f1a05cf9b5f75f17be", "repo_path": "/integration/gaia-central" } From 8177e29476b16898494486acdf7464127dde89fe Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 02:56:39 -0700 Subject: [PATCH 42/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a5f6aea7b2e4..d89ff7a9f0e4 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 db68110db653..3d0cfdd7c0a3 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 0b4e46a69ead..a2d2abdfefb0 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 a5f6aea7b2e4..d89ff7a9f0e4 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 cae61f1b5eb5..0d40e9df4877 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 48f252c7dddc..9635eef90438 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 a6b532922da0..d9f926095e86 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 3925d4480457..4a8cce9cc076 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 f025007ccae6..4dfb5e5adbdb 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 0296380c6e9e1e506bfe28fa258052243df385e1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 04:05:26 -0700 Subject: [PATCH 43/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d8a42299ad49 Author: vingtetun <21@vingtetun.org> Desc: Merge pull request #20842 from vingtetun/homescreen-on-nightly-race Bug 1027555 - [Vertical Homescreen] No icons on homescreen with DEBUG=1 ... ======== https://hg.mozilla.org/integration/gaia-central/rev/f5ff909b584b Author: Vivien Nicolas Desc: Bug 1027555 - [Vertical Homescreen] No icons on homescreen with DEBUG=1 mode on nightly. r=me --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9ac17e6f68e7..1f7551352fc9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b4915d85ad52f5bdc4cc55f1a05cf9b5f75f17be", + "revision": "d8a42299ad4923d96265015f7cb996631711c6b8", "repo_path": "/integration/gaia-central" } From 91b11f1fd73a120795718a92c23f208c2d23e6cf Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 04:11:39 -0700 Subject: [PATCH 44/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d89ff7a9f0e4..5bd529b060aa 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 3d0cfdd7c0a3..bf4a5a0afed3 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 a2d2abdfefb0..aaef61ca2927 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 d89ff7a9f0e4..5bd529b060aa 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 0d40e9df4877..12a8d243bbc9 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 9635eef90438..bbaf59eafcb5 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 d9f926095e86..eb6f189d2ea9 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 4a8cce9cc076..0381c5d34182 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 4dfb5e5adbdb..26bd4ef9283e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 08ee6b38a02e0b25e58c442b7e736b435837ac8b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 09:20:28 -0700 Subject: [PATCH 45/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1cbab43be164 Author: Kevin Grandon Desc: Merge pull request #20837 from daleharvey/1027463 Bug 1027463 - Check for element before clearing. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/abbee496ef14 Author: Dale Harvey Desc: Bug 1027463 - Check for element before clearing. 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 1f7551352fc9..925a3ed39d44 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d8a42299ad4923d96265015f7cb996631711c6b8", + "revision": "1cbab43be1643d4dbea2183dea4c1646741af6c0", "repo_path": "/integration/gaia-central" } From fcfb511e3f47e8e408abf069cbe03fdbc58bef56 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 09:26:11 -0700 Subject: [PATCH 46/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 5bd529b060aa..c0326dba7d54 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 bf4a5a0afed3..96aaae02c4eb 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 aaef61ca2927..1d38bbd2bd9d 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 5bd529b060aa..c0326dba7d54 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 12a8d243bbc9..4ba3cda74a45 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 bbaf59eafcb5..da2617139005 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 eb6f189d2ea9..420f36708481 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 0381c5d34182..45469b035340 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 26bd4ef9283e..fdbf6bb36080 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 98c1c3805b7dfd6ad325728f66889ca7a8292219 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 09:50:26 -0700 Subject: [PATCH 47/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f6556c09eb6c Author: Kevin Grandon Desc: Merge pull request #20841 from KevinGrandon/bug_839491_unrecoverable_app_install Bug 839491 - Handle unrecoverable app installs from the homescreen/search/collections apps ======== https://hg.mozilla.org/integration/gaia-central/rev/8067c03cac21 Author: James Lal Desc: Bug 839491 - Handle unrecoverable app installs from the homescreen/search/collections apps 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 925a3ed39d44..ed03da0dc6a7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "1cbab43be1643d4dbea2183dea4c1646741af6c0", + "revision": "f6556c09eb6c0e2152de2f880a0d41245e8408c1", "repo_path": "/integration/gaia-central" } From fedbed80516e573a8f00337caaf22b1ae984b538 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 09:56:39 -0700 Subject: [PATCH 48/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c0326dba7d54..df50b7606448 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 96aaae02c4eb..e0911e1e1a46 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 1d38bbd2bd9d..193cf30402de 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 c0326dba7d54..df50b7606448 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 4ba3cda74a45..d04d7987ab9c 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 da2617139005..8848dd313ea3 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 420f36708481..4df1d4c8240b 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 45469b035340..22e490a772a2 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 fdbf6bb36080..ffeb509ce328 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2aa8909257e56998dddb97d991445e4f238754cd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 19:40:26 -0700 Subject: [PATCH 49/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4b075d3d4d4a Author: James Burke Desc: Merge pull request #20813 from jrburke/bug1028055-email-reader-title Bug 1028055 - Sender's email is not displayed In the details page of a received email r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/45ce016d4805 Author: jrburke Desc: Bug 1028055 - Sender's email is not displayed In the details page of a received email --- 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 ed03da0dc6a7..8c4e190f6ee8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f6556c09eb6c0e2152de2f880a0d41245e8408c1", + "revision": "4b075d3d4d4a509b2e6f3c4a2b7a8c7e2ff58b0f", "repo_path": "/integration/gaia-central" } From 5ec6f02b5a907a25bdd658f6c0efa0b64c05b9f9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 21 Jun 2014 19:46:14 -0700 Subject: [PATCH 50/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index df50b7606448..3ba41a76fdb5 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 e0911e1e1a46..fc5ede274fb8 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 193cf30402de..39a06ff33c84 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 df50b7606448..3ba41a76fdb5 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 d04d7987ab9c..0ae8a01bd7da 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 8848dd313ea3..8ba46785556a 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 4df1d4c8240b..7dd217f687fa 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 22e490a772a2..15b5a0e4c064 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 ffeb509ce328..7feaf013ec7f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 538cab8e5c622f32357ba8e2cb8859110d58eb3f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 10:15:32 -0700 Subject: [PATCH 51/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/9446125ac99a Author: Fernando Jiménez Moreno Desc: Merge pull request #20696 from ferjm/bug1023266.mobileid.permission.2 Bug 1023266 - Make the Mobile ID API privileged. r=arthurcc ======== https://hg.mozilla.org/integration/gaia-central/rev/52c1791c0a91 Author: Fernando Jiménez Desc: Bug 1023266 - Make the Mobile ID API privileged. r=arthurcc --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8c4e190f6ee8..33496b589b70 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4b075d3d4d4a509b2e6f3c4a2b7a8c7e2ff58b0f", + "revision": "9446125ac99abbb7e50bb16990becf1a0544368f", "repo_path": "/integration/gaia-central" } From 61a0e26e1f80f06f1d88fc517584531772b12300 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 10:21:15 -0700 Subject: [PATCH 52/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3ba41a76fdb5..65fb37bdb84b 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 fc5ede274fb8..1f25417ca3b5 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 39a06ff33c84..632e146e411c 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 3ba41a76fdb5..65fb37bdb84b 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 0ae8a01bd7da..3dcd2b3eacd4 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 8ba46785556a..49206d1dd1e8 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 7dd217f687fa..e39a9d6a4c3c 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 15b5a0e4c064..ac609245a3ae 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 7feaf013ec7f..b4bd4854db1f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 94040dd3fa72ed971ea0320aff3a3f509c851aa4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 11:50:27 -0700 Subject: [PATCH 53/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b525e07b2f32 Author: Alive.Kuo Desc: Merge pull request #20731 from alivedise/bugzilla/1024168_master/v2/dispatch-event-of-inner-window Bug 1024168 - Dispatch inner window event on its element, r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/66135d8aa939 Author: Alive Kuo Desc: Bug 1024168 - Dispatch inner window event on its element --- 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 33496b589b70..349057e7d138 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9446125ac99abbb7e50bb16990becf1a0544368f", + "revision": "b525e07b2f321f2b43c54ae7841345d49fc5a5bc", "repo_path": "/integration/gaia-central" } From 2e0d1c07de15823b19fad8bd1c84a08f9b1bd11d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 11:56:09 -0700 Subject: [PATCH 54/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 65fb37bdb84b..cd7cd8b0fac5 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 1f25417ca3b5..fa260be27ae8 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 632e146e411c..de9b5d2dc32a 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 65fb37bdb84b..cd7cd8b0fac5 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 3dcd2b3eacd4..5e400c413882 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 49206d1dd1e8..ce58d7935f46 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 e39a9d6a4c3c..1ab00d80db4e 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 ac609245a3ae..4087faebf1b0 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 b4bd4854db1f..a8f9209518bb 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 66052f7b836324e322bd25582ca36f3116454c2f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 16:30:26 -0700 Subject: [PATCH 55/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/32ee3c41dbd9 Author: Kevin Grandon Desc: Merge pull request #20832 from daleharvey/1026007 Bug 1026007 - Dismiss notification if use presses enter. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/c577ecbdb17d Author: Dale Harvey Desc: Bug 1026007 - Dismiss notification if use presses enter. 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 349057e7d138..b77ef490f5f9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b525e07b2f321f2b43c54ae7841345d49fc5a5bc", + "revision": "32ee3c41dbd9da013242d173abdeb8a39b21c624", "repo_path": "/integration/gaia-central" } From beab8129d66fbb1ba7a491bd3bf03180e6ac4929 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 16:36:10 -0700 Subject: [PATCH 56/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index cd7cd8b0fac5..dd8608616f01 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 fa260be27ae8..63577a7ec8e2 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 de9b5d2dc32a..e1452edb2939 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 cd7cd8b0fac5..dd8608616f01 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 5e400c413882..619a1f2a881a 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 ce58d7935f46..0b63d846443e 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 1ab00d80db4e..ce4f3940894c 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 4087faebf1b0..b3b7602bde4a 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 a8f9209518bb..d49c2fc7838c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4b69171efc84712f0cb1952eca8eeee6f49d7068 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 17:00:27 -0700 Subject: [PATCH 57/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/00fa531efc85 Author: Gareth Aye Desc: Merge pull request #20867 from gaye/ochameau-marionette-with-custom-geckko Bug 1019152 - Upgrade marionette-js-runner to 0.5.2 to pick up :ochameau work ======== https://hg.mozilla.org/integration/gaia-central/rev/333acea5bd19 Author: gaye Desc: Bug 1019152 - Upgrade marionette-js-runner to 0.5.2 to pick up :ochameau work --- 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 b77ef490f5f9..b61a2b28bd8f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "32ee3c41dbd9da013242d173abdeb8a39b21c624", + "revision": "00fa531efc85eb0b53bc52121efea598aef19e67", "repo_path": "/integration/gaia-central" } From 92ea56e2a5e6b2fa61c10e792708d5ee51bf4ef9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 17:06:11 -0700 Subject: [PATCH 58/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index dd8608616f01..2e4c5e1d4f5f 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 63577a7ec8e2..67baf9478bed 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 e1452edb2939..0785882bdc30 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 dd8608616f01..2e4c5e1d4f5f 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 619a1f2a881a..2fd408ced545 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 0b63d846443e..38de4569fca3 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 ce4f3940894c..34266c00c501 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 b3b7602bde4a..344375f5f27b 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 d49c2fc7838c..9d19c9735a35 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From b9397c68fff197f5e088b74be8dee5ddda1b0c2c Mon Sep 17 00:00:00 2001 From: Jocelyn Liu Date: Mon, 23 Jun 2014 10:32:58 +0800 Subject: [PATCH 59/96] Bug 1027552 - Align values in BluetoothAttributeEvent.attrs with webidl, r=btian --- dom/bluetooth2/BluetoothAdapter.cpp | 7 +++++-- dom/bluetooth2/BluetoothCommon.h | 12 ++++++++++++ dom/bluetooth2/BluetoothManager.cpp | 4 +++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dom/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth2/BluetoothAdapter.cpp index 72517e5b4587..7248bafc093b 100644 --- a/dom/bluetooth2/BluetoothAdapter.cpp +++ b/dom/bluetooth2/BluetoothAdapter.cpp @@ -699,7 +699,10 @@ BluetoothAdapter::EnableDisable(bool aEnable) } nsTArray types; - types.AppendElement(NS_LITERAL_STRING("State")); + BT_APPEND_ENUM_STRING(types, + BluetoothAdapterAttribute, + BluetoothAdapterAttribute::State); + DispatchAttributeEvent(types); nsRefPtr result = @@ -792,7 +795,7 @@ BluetoothAdapter::HandlePropertyChanged(const BluetoothValue& aValue) // BluetoothAdapterAttribute properties if (IsAdapterAttributeChanged(type, arr[i].value())) { SetPropertyByValue(arr[i]); - types.AppendElement(arr[i].name()); + BT_APPEND_ENUM_STRING(types, BluetoothAdapterAttribute, type); } } diff --git a/dom/bluetooth2/BluetoothCommon.h b/dom/bluetooth2/BluetoothCommon.h index 44d3c8192132..eca1973a19a2 100644 --- a/dom/bluetooth2/BluetoothCommon.h +++ b/dom/bluetooth2/BluetoothCommon.h @@ -83,6 +83,18 @@ extern bool gBluetoothDebugFlag; } \ } while(0) +/** + * Convert an enum value to string then append it to an array. + */ +#define BT_APPEND_ENUM_STRING(array, enumType, enumValue) \ + do { \ + uint32_t index = uint32_t(enumValue); \ + nsAutoString name; \ + name.AssignASCII(enumType##Values::strings[index].value, \ + enumType##Values::strings[index].length); \ + array.AppendElement(name); \ + } while(0) \ + #define BEGIN_BLUETOOTH_NAMESPACE \ namespace mozilla { namespace dom { namespace bluetooth { #define END_BLUETOOTH_NAMESPACE \ diff --git a/dom/bluetooth2/BluetoothManager.cpp b/dom/bluetooth2/BluetoothManager.cpp index 6bf0c514ae83..2fc68b2cb938 100644 --- a/dom/bluetooth2/BluetoothManager.cpp +++ b/dom/bluetooth2/BluetoothManager.cpp @@ -260,7 +260,9 @@ BluetoothManager::DispatchAttributeEvent() JSAutoCompartment ac(cx, scope); nsTArray types; - types.AppendElement(NS_LITERAL_STRING("DefaultAdapter")); + BT_APPEND_ENUM_STRING(types, + BluetoothManagerAttribute, + BluetoothManagerAttribute::DefaultAdapter); if (!ToJSValue(cx, types, &value)) { JS_ClearPendingException(cx); From bcc96bb48ded1de0df18654fea73a6e677eafd2f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 20:45:33 -0700 Subject: [PATCH 60/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/22676ea57975 Author: Arthur Chen Desc: Merge pull request #20792 from crh0716/1022710 Bug 1022710 - Do not update the visibility of the items when the voice type is null r=eragon ======== https://hg.mozilla.org/integration/gaia-central/rev/66a7b846016a Author: Arthur Chen Desc: Bug 1022710 - Do not update the visibility of the items when the voice type is null --- 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 b61a2b28bd8f..4b7c68d31364 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "00fa531efc85eb0b53bc52121efea598aef19e67", + "revision": "22676ea57975d2d342a6fee1387e9dca4aefe7ef", "repo_path": "/integration/gaia-central" } From 8e608eab25f7bd4012bac0d019dd2c5ea801bdcc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 20:51:17 -0700 Subject: [PATCH 61/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2e4c5e1d4f5f..b0d035c9abac 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 67baf9478bed..a142cb42a5e1 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 0785882bdc30..e8b62d99c005 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 2e4c5e1d4f5f..b0d035c9abac 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 2fd408ced545..afdb821a1767 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 38de4569fca3..33c7484b06a5 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 34266c00c501..72b375a7954d 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 344375f5f27b..870bc64cd9a6 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 9d19c9735a35..26418392cdeb 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e73d48574a89264b26f97c479216280d87b9c448 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 21:25:28 -0700 Subject: [PATCH 62/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b7162b41e218 Author: Arthur Chen Desc: Merge pull request #20784 from crh0716/1023044 Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/10a4ef35503f Author: Arthur Chen Desc: Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4b7c68d31364..a746b30d7aa3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "22676ea57975d2d342a6fee1387e9dca4aefe7ef", + "revision": "b7162b41e218d72b9b7543d9b8f4639fd39baf88", "repo_path": "/integration/gaia-central" } From f50ec9a85519c9816b0f1ae570f9022f1ba6076f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 21:31:17 -0700 Subject: [PATCH 63/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b0d035c9abac..ff630b326a3b 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 a142cb42a5e1..d9b9930f34e3 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 e8b62d99c005..1e6f8497b40e 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 b0d035c9abac..ff630b326a3b 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 afdb821a1767..9ba251a28a4d 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 33c7484b06a5..f720a886032c 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 72b375a7954d..9f37a0671676 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 870bc64cd9a6..d7579ff28b1d 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 26418392cdeb..5983cfece6bd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From b5003d0c2cd499b686616c1a8e74d536699c04d8 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 19 Jun 2014 16:27:15 +0800 Subject: [PATCH 64/96] Bug 979134 (follow-up): convert test_call_barring_change_password.js to Promise. r=vicamo --- dom/mobileconnection/tests/marionette/head.js | 17 +++- .../test_call_barring_change_password.js | 89 ++++++++----------- 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/head.js b/dom/mobileconnection/tests/marionette/head.js index ddd5e420be9e..d50d7d5ddd87 100644 --- a/dom/mobileconnection/tests/marionette/head.js +++ b/dom/mobileconnection/tests/marionette/head.js @@ -566,7 +566,7 @@ function sendMMI(aMmi) { * Query current voice privacy mode. * * Fulfill params: - A boolean indicates the current voice privacy mode. + * A boolean indicates the current voice privacy mode. * Reject params: * 'RadioNotAvailable', 'RequestNotSupported', or 'GenericFailure'. * @@ -578,6 +578,21 @@ function sendMMI(aMmi) { .then(() => request.result, () => { throw request.error }); } +/** + * Change call barring facility password. + * + * Fulfill params: (none) + * Reject params: + * 'RadioNotAvailable', 'RequestNotSupported', or 'GenericFailure'. + * + * @return A deferred promise. + */ + function changeCallBarringPassword(aOptions) { + let request = mobileConnection.changeCallBarringPassword(aOptions); + return wrapDomRequestAsPromise(request) + .then(null, () => { throw request.error }); +} + /** * Set data connection enabling state and wait for "datachange" event. * diff --git a/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js b/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js index 12a5e2ce5ef3..707be64a7d9e 100644 --- a/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js +++ b/dom/mobileconnection/tests/marionette/test_call_barring_change_password.js @@ -2,62 +2,49 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -SpecialPowers.addPermission("mobileconnection", true, document); +const TEST_DATA = [ + // [, , ] -// Permission changes can't change existing Navigator.prototype -// objects, so grab our objects from a new Navigator -let ifr = document.createElement("iframe"); -let connection; -ifr.onload = function() { - connection = ifr.contentWindow.navigator.mozMobileConnections[0]; + // Test passing an invalid pin or newPin. + [null, "0000", "InvalidPassword"], + ["0000", null, "InvalidPassword"], + [null, null, "InvalidPassword"], - ok(connection instanceof ifr.contentWindow.MozMobileConnection, - "connection is instanceof " + connection.constructor); + // Test passing mismatched newPin. + ["000", "0000", "InvalidPassword"], + ["00000", "1111", "InvalidPassword"], + ["abcd", "efgh", "InvalidPassword"], - setTimeout(testChangeCallBarringPasswordWithFailure, 0); -}; -document.body.appendChild(ifr); + // TODO: Bug 906603 - B2G RIL: Support Change Call Barring Password on Emulator. + // Currently emulator doesn't support REQUEST_CHANGE_BARRING_PASSWORD, so we + // expect to get a 'RequestNotSupported' error here. + ["1234", "1234", "RequestNotSupported"] +]; -function testChangeCallBarringPasswordWithFailure() { - // Incorrect parameters, expect onerror callback. - let options = [ - {pin: null, newPin: '0000'}, - {pin: '0000', newPin: null}, - {pin: null, newPin: null}, - {pin: '000', newPin: '0000'}, - {pin: '00000', newPin: '1111'}, - {pin: 'abcd', newPin: 'efgh'}, - ]; +function testChangeCallBarringPassword(aPin, aNewPin, aExpectedError) { + log("Test changing call barring password to " + aPin + "/" + aNewPin); - function do_test() { - for (let i = 0; i < options.length; i++) { - let request = connection.changeCallBarringPassword(options[i]); + let options = { + pin: aPin, + newPin: aNewPin + }; + return changeCallBarringPassword(options) + .then(function resolve() { + ok(!aExpectedError, "changeCallBarringPassword success"); + }, function reject(aError) { + is(aError.name, aExpectedError, "failed to changeCallBarringPassword"); + }); +} - request.onsuccess = function() { - ok(false, 'Unexpected result.'); - setTimeout(cleanUp , 0); - }; - - request.onerror = function() { - ok(request.error.name === 'InvalidPassword', 'InvalidPassword'); - if (i >= options.length) { - setTimeout(testChangeCallBarringPasswordWithSuccess, 0); - } - }; - } +// Start tests +startTestCommon(function() { + let promise = Promise.resolve(); + for (let i = 0; i < TEST_DATA.length; i++) { + let data = TEST_DATA[i]; + promise = + promise.then(() => testChangeCallBarringPassword(data[0], data[1], data[2])); } - - do_test(); -} - -function testChangeCallBarringPasswordWithSuccess() { - // TODO: Bug 906603 - B2G RIL: Support Change Call Barring Password on - // Emulator. - setTimeout(cleanUp , 0); -} - -function cleanUp() { - SpecialPowers.removePermission("mobileconnection", document); - finish(); -} + return promise; +}); From 93d73766512e0a5c2c57cd006894e25a27dd4a0c Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 19 Jun 2014 16:48:14 +0800 Subject: [PATCH 65/96] Bug 979134 (follow-up): convert test_call_barring_get_option.js to Promise. r=vicamo --- dom/mobileconnection/tests/marionette/head.js | 17 ++++ .../test_call_barring_get_option.js | 95 +++++++++++++------ 2 files changed, 82 insertions(+), 30 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/head.js b/dom/mobileconnection/tests/marionette/head.js index d50d7d5ddd87..88ef0b0fed1c 100644 --- a/dom/mobileconnection/tests/marionette/head.js +++ b/dom/mobileconnection/tests/marionette/head.js @@ -578,6 +578,23 @@ function sendMMI(aMmi) { .then(() => request.result, () => { throw request.error }); } +/** + * Queries current call barring status. + * + * Fulfill params: + * An object contains call barring status. + * Reject params: + * 'RadioNotAvailable', 'RequestNotSupported', 'InvalidParameter' or + * 'GenericFailure'. + * + * @return A deferred promise. + */ + function getCallBarringOption(aOptions) { + let request = mobileConnection.getCallBarringOption(aOptions); + return wrapDomRequestAsPromise(request) + .then(() => request.result, () => { throw request.error }); +} + /** * Change call barring facility password. * diff --git a/dom/mobileconnection/tests/marionette/test_call_barring_get_option.js b/dom/mobileconnection/tests/marionette/test_call_barring_get_option.js index a092c00a2e9a..7ce5afc7bb4e 100644 --- a/dom/mobileconnection/tests/marionette/test_call_barring_get_option.js +++ b/dom/mobileconnection/tests/marionette/test_call_barring_get_option.js @@ -2,38 +2,73 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -SpecialPowers.addPermission("mobileconnection", true, document); +const TEST_DATA = [ + // Test passing invalid program. + { + options: { + program: 5, /* Invalid program */ + serviceClass: 0 + }, + expectedError: "InvalidParameter" + }, { + options: { + program: null, + serviceClass: 0 + }, + expectedError: "InvalidParameter" + }, { + options: { + /* Undefined program */ + serviceClass: 0 + }, + expectedError: "InvalidParameter" + }, + // Test passing invalid serviceClass. + { + options: { + program: MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + serviceClass: null + }, + expectedError: "InvalidParameter" + }, { + options: { + program: MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + /* Undefined serviceClass */ + }, + expectedError: "InvalidParameter" + }, + // TODO: Bug 1027546 - [B2G][Emulator] Support call barring + // Currently emulator doesn't support call barring, so we expect to get a + // 'RequestNotSupported' error here. + { + options: { + program: MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + serviceClass: 0 + }, + expectedError: "RequestNotSupported" + } +]; -// Permission changes can't change existing Navigator.prototype -// objects, so grab our objects from a new Navigator -let ifr = document.createElement("iframe"); -let connection; -ifr.onload = function() { - connection = ifr.contentWindow.navigator.mozMobileConnections[0]; +function testGetCallBarringOption(aOptions, aExpectedError) { + log("Test getting call barring to " + JSON.stringify(aOptions)); - ok(connection instanceof ifr.contentWindow.MozMobileConnection, - "connection is instanceof " + connection.constructor); - - testGetCallBarringOption(); -}; -document.body.appendChild(ifr); - -function testGetCallBarringOption() { - let option = {'program': 0, 'password': '', 'serviceClass': 0}; - let request = connection.getCallBarringOption(option); - request.onsuccess = function() { - ok(request.result); - ok('enabled' in request.result, 'should have "enabled" field'); - cleanUp(); - }; - request.onerror = function() { - // Call barring is not supported by current emulator. - cleanUp(); - }; + return getCallBarringOption(aOptions) + .then(function resolve(aResult) { + ok(false, "should not success"); + }, function reject(aError) { + is(aError.name, aExpectedError, "failed to getCallBarringOption"); + }); } -function cleanUp() { - SpecialPowers.removePermission("mobileconnection", document); - finish(); -} +// Start tests +startTestCommon(function() { + let promise = Promise.resolve(); + for (let i = 0; i < TEST_DATA.length; i++) { + let data = TEST_DATA[i]; + promise = promise.then(() => testGetCallBarringOption(data.options, + data.expectedError)); + } + return promise; +}); From 53a55d85202a3c68a601364a3e72373bdc6d6220 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 19 Jun 2014 17:10:38 +0800 Subject: [PATCH 66/96] Bug 979134 (follow-up): convert test_call_barring_set_error.js to Promise. r=vicamo --- dom/mobileconnection/tests/marionette/head.js | 16 ++ .../marionette/test_call_barring_set_error.js | 176 +++++++++++------- 2 files changed, 128 insertions(+), 64 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/head.js b/dom/mobileconnection/tests/marionette/head.js index 88ef0b0fed1c..4e74b35170ed 100644 --- a/dom/mobileconnection/tests/marionette/head.js +++ b/dom/mobileconnection/tests/marionette/head.js @@ -578,6 +578,22 @@ function sendMMI(aMmi) { .then(() => request.result, () => { throw request.error }); } +/** + * Configures call barring options. + * + * Fulfill params: (none) + * Reject params: + * 'RadioNotAvailable', 'RequestNotSupported', 'InvalidParameter' or + * 'GenericFailure'. + * + * @return A deferred promise. + */ + function setCallBarringOption(aOptions) { + let request = mobileConnection.setCallBarringOption(aOptions); + return wrapDomRequestAsPromise(request) + .then(null, () => { throw request.error }); +} + /** * Queries current call barring status. * diff --git a/dom/mobileconnection/tests/marionette/test_call_barring_set_error.js b/dom/mobileconnection/tests/marionette/test_call_barring_set_error.js index 88c26eb99ad3..d62574461d3b 100644 --- a/dom/mobileconnection/tests/marionette/test_call_barring_set_error.js +++ b/dom/mobileconnection/tests/marionette/test_call_barring_set_error.js @@ -2,73 +2,121 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -SpecialPowers.addPermission("mobileconnection", true, document); - -// Permission changes can't change existing Navigator.prototype -// objects, so grab our objects from a new Navigator -let ifr = document.createElement("iframe"); -let connection; -ifr.onload = function() { - connection = ifr.contentWindow.navigator.mozMobileConnections[0]; - - ok(connection instanceof ifr.contentWindow.MozMobileConnection, - "connection is instanceof " + connection.constructor); - - nextTest(); -}; -document.body.appendChild(ifr); - -let caseId = 0; -let options = [ - buildOption(5, true, '0000', 0), // invalid program. - - // test null. - buildOption(null, true, '0000', 0), - buildOption(0, null, '0000', 0), - buildOption(0, true, null, 0), - buildOption(0, true, '0000', null), - - // test undefined. - {'enabled': true, 'password': '0000', 'serviceClass': 0}, - {'program': 0, 'password': '0000', 'serviceClass': 0}, - {'program': 0, 'enabled': true, 'serviceClass': 0}, - {'program': 0, 'enabled': true, 'password': '0000'}, +const TEST_DATA = [ + // Test passing invalid program. + { + options: { + "program": 5, /* Invalid program */ + "enabled": true, + "password": "0000", + "serviceClass": 0 + }, + expectedError: "InvalidParameter" + }, { + options: { + "program": null, + "enabled": true, + "password": "0000", + "serviceClass": 0 + }, + expectedError: "InvalidParameter" + }, { + options: { + /* Undefined program */ + "enabled": true, + "password": "0000", + "serviceClass": 0 + }, + expectedError: "InvalidParameter" + }, + // Test passing invalid enabled. + { + options: { + "program": MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + "enabled": null, + "password": "0000", + "serviceClass": 0 + }, + expectedError: "InvalidParameter" + }, { + options: { + "program": MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + /* Undefined enabled */ + "password": "0000", + "serviceClass": 0 + }, + expectedError: "InvalidParameter" + }, + // Test passing invalid password. + { + options: { + "program": MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + "enabled": true, + "password": null, + "serviceClass": 0 + }, + expectedError: "InvalidParameter" + }, { + options: { + "program": MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + "enabled": true, + /* Undefined password */ + "serviceClass": 0 + }, + expectedError: "InvalidParameter" + }, + // Test passing invalid serviceClass. + { + options: { + "program": MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + "enabled": true, + "password": "0000", + "serviceClass": null + }, + expectedError: "InvalidParameter" + }, { + options: { + "program": MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + "enabled": true, + "password": "0000", + /* Undefined serviceClass */ + }, + expectedError: "InvalidParameter" + }, + // TODO: Bug 1027546 - [B2G][Emulator] Support call barring + // Currently emulator doesn't support call barring, so we expect to get a + // 'RequestNotSupported' error here. + { + options: { + "program": MozMobileConnection.CALL_BARRING_PROGRAM_ALL_OUTGOING, + "enabled": true, + "password": "0000", + "serviceClass": 0 + }, + expectedError: "RequestNotSupported" + } ]; -function buildOption(program, enabled, password, serviceClass) { - return { - 'program': program, - 'enabled': enabled, - 'password': password, - 'serviceClass': serviceClass - }; +function testSetCallBarringOption(aOptions, aExpectedError) { + log("Test setting call barring to " + JSON.stringify(aOptions)); + + return setCallBarringOption(aOptions) + .then(function resolve() { + ok(false, "changeCallBarringPassword success"); + }, function reject(aError) { + is(aError.name, aExpectedError, "failed to changeCallBarringPassword"); + }); } -function testSetCallBarringOptionError(option) { - let request = connection.setCallBarringOption(option); - request.onsuccess = function() { - ok(false, - 'should not fire onsuccess for invaild call barring option: ' - + JSON.stringify(option)); - }; - request.onerror = function(event) { - is(event.target.error.name, 'InvalidParameter', JSON.stringify(option)); - nextTest(); - }; -} - -function nextTest() { - if (caseId >= options.length) { - cleanUp(); - } else { - let option = options[caseId++]; - log('test for ' + JSON.stringify(option)); - testSetCallBarringOptionError(option); +// Start tests +startTestCommon(function() { + let promise = Promise.resolve(); + for (let i = 0; i < TEST_DATA.length; i++) { + let data = TEST_DATA[i]; + promise = promise.then(() => testSetCallBarringOption(data.options, + data.expectedError)); } -} - -function cleanUp() { - SpecialPowers.removePermission("mobileconnection", document); - finish(); -} + return promise; +}); From 8f4c6326796b316e3d9cc2085a832a0de7281845 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 19 Jun 2014 18:11:51 +0800 Subject: [PATCH 67/96] Bug 979134 (follow-up): convert test_mobile_icc_change.js to Promise. r=vicamo --- .../marionette/test_mobile_icc_change.js | 97 +++++-------------- 1 file changed, 23 insertions(+), 74 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_icc_change.js b/dom/mobileconnection/tests/marionette/test_mobile_icc_change.js index b93b9272e374..be7a762f80a5 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_icc_change.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_icc_change.js @@ -1,84 +1,33 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -MARIONETTE_TIMEOUT = 30000; +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -SpecialPowers.addPermission("mobileconnection", true, document); +// The emulator's hard coded iccid value. +const ICCID = "89014103211118510720"; -// Permission changes can't change existing Navigator.prototype -// objects, so grab our objects from a new Navigator -let ifr = document.createElement("iframe"); -let connection; -ifr.onload = function() { - connection = ifr.contentWindow.navigator.mozMobileConnections[0]; - ok(connection instanceof ifr.contentWindow.MozMobileConnection, - "connection is instanceof " + connection.constructor); +function setRadioEnabledAndWaitIccChange(aEnabled) { + let promises = []; + promises.push(waitForManagerEvent("iccchange")); + promises.push(setRadioEnabled(aEnabled)); - // The emulator's hard coded iccid value. - // See it here {B2G_HOME}/external/qemu/telephony/sim_card.c. - is(connection.iccId, 89014103211118510720); - - runNextTest(); -}; -document.body.appendChild(ifr); - -function waitForIccChange(callback) { - connection.addEventListener("iccchange", function handler() { - connection.removeEventListener("iccchange", handler); - callback(); - }); + return Promise.all(promises); } -function setRadioEnabled(enabled) { - let request = connection.setRadioEnabled(enabled); +// Start tests +startTestCommon(function() { + log("Test initial iccId"); + is(mobileConnection.iccId, ICCID); - request.onsuccess = function onsuccess() { - log('setRadioEnabled: ' + enabled); - }; + return setRadioEnabledAndWaitIccChange(false) + .then(() => { + is(mobileConnection.iccId, null); + }) - request.onerror = function onerror() { - ok(false, "setRadioEnabled should be ok"); - }; -} - -function testIccChangeOnRadioPowerOff() { - // Turn off radio - setRadioEnabled(false); - - waitForIccChange(function() { - is(connection.iccId, null); - runNextTest(); - }); -} - -function testIccChangeOnRadioPowerOn() { - // Turn on radio - setRadioEnabled(true); - - waitForIccChange(function() { - // The emulator's hard coded iccid value. - is(connection.iccId, 89014103211118510720); - runNextTest(); - }); -} - -let tests = [ - testIccChangeOnRadioPowerOff, - testIccChangeOnRadioPowerOn -]; - -function runNextTest() { - let test = tests.shift(); - if (!test) { - cleanUp(); - return; - } - - test(); -} - -function cleanUp() { - SpecialPowers.removePermission("mobileconnection", document); - - finish(); -} + // Restore radio state. + .then(() => setRadioEnabledAndWaitIccChange(true)) + .then(() => { + is(mobileConnection.iccId, ICCID); + }); +}); From 13458abe0d0e1505ad625ad75558e11afd3f9049 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 19 Jun 2014 18:38:47 +0800 Subject: [PATCH 68/96] Bug 979134 (follow-up): convert test_mobile_last_known_network.js to Promise. r=vicamo --- .../test_mobile_last_known_network.js | 48 +++---------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_last_known_network.js b/dom/mobileconnection/tests/marionette/test_mobile_last_known_network.js index 3adb50694f45..0fc9efa36248 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_last_known_network.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_last_known_network.js @@ -1,47 +1,13 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -MARIONETTE_TIMEOUT = 30000; +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -SpecialPowers.addPermission("mobilenetwork", true, document); - -let connection = navigator.mozMobileConnections[0]; -ok(connection instanceof MozMobileConnection, - "connection is instanceof " + connection.constructor); - - -function testLastKnownNetwork() { - log("testLastKnownNetwork: " + connection.lastKnownNetwork); +// Start tests +startTestCommon(function() { // The emulator's hard coded operatoer's mcc and mnc codes. - is(connection.lastKnownNetwork, "310-260"); - runNextTest(); -} - -function testLastKnownHomeNetwork() { - log("testLastKnownHomeNetwork: " + connection.lastKnownHomeNetwork); + is(mobileConnection.lastKnownNetwork, "310-260"); // The emulator's hard coded icc's mcc and mnc codes. - is(connection.lastKnownHomeNetwork, "310-260"); - runNextTest(); -} - -let tests = [ - testLastKnownNetwork, - testLastKnownHomeNetwork -]; - -function runNextTest() { - let test = tests.shift(); - if (!test) { - cleanUp(); - return; - } - - test(); -} - -function cleanUp() { - SpecialPowers.removePermission("mobilenetwork", document); - finish(); -} - -runNextTest(); + is(mobileConnection.lastKnownHomeNetwork, "310-260"); +}); From 2fac38de55342e5fde52b9bbcd003e8dfa8481b7 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 19 Jun 2014 18:43:48 +0800 Subject: [PATCH 69/96] Bug 979134 (follow-up): convert test_mobile_set_radio.js to Promise. r=vicamo --- .../tests/marionette/test_mobile_set_radio.js | 177 +++--------------- 1 file changed, 25 insertions(+), 152 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js b/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js index 2d3d421dbc12..376752a0c55c 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js @@ -2,167 +2,40 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -const DATA_KEY = "ril.data.enabled"; -const APN_KEY = "ril.data.apnSettings"; +// Start tests +startTestCommon(function() { -let Promise = SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise; + let origApnSettings; + return getDataApnSettings() + .then(value => { + origApnSettings = value; + }) -SpecialPowers.setBoolPref("dom.mozSettings.enabled", true); -SpecialPowers.addPermission("mobileconnection", true, document); -SpecialPowers.addPermission("settings-read", true, document); -SpecialPowers.addPermission("settings-write", true, document); + // Test disabling/enabling radio power. + .then(() => setRadioEnabledAndWait(false)) + .then(() => setRadioEnabledAndWait(true)) -let settings = window.navigator.mozSettings; -let connection = window.navigator.mozMobileConnections[0]; -ok(connection instanceof MozMobileConnection, - "connection is instanceof " + connection.constructor); - -function setSetting(key, value) { - let deferred = Promise.defer(); - - let setLock = settings.createLock(); - let obj = {}; - obj[key] = value; - - let setReq = setLock.set(obj); - setReq.addEventListener("success", function onSetSuccess() { - ok(true, "set '" + key + "' to " + obj[key]); - deferred.resolve(); - }); - setReq.addEventListener("error", function onSetError() { - ok(false, "cannot set '" + key + "'"); - deferred.reject(); - }); - - return deferred.promise; -} - -function setEmulatorAPN() { - let apn = - [ - [ + // Test disabling radio when data is connected. + .then(() => { + let apnSettings = [[ {"carrier":"T-Mobile US", "apn":"epc.tmobile.com", "mmsc":"http://mms.msg.eng.t-mobile.com/mms/wapenc", - "types":["default","supl","mms"]} - ] - ]; - return setSetting(APN_KEY, apn); -} - -function enableData() { - log("Turn data on."); - - let deferred = Promise.defer(); - - connection.addEventListener("datachange", function ondatachange() { - if (connection.data.connected === true) { - connection.removeEventListener("datachange", ondatachange); - log("mobileConnection.data.connected is now '" - + connection.data.connected + "'."); - deferred.resolve(); - } - }); - - setEmulatorAPN() - .then(() => setSetting(DATA_KEY, true)); - - return deferred.promise; -} - -function receivedPending(received, pending, nextAction) { - let index = pending.indexOf(received); - if (index != -1) { - pending.splice(index, 1); - } - if (pending.length === 0) { - nextAction(); - } -} - -function waitRadioState(state) { - let deferred = Promise.defer(); - - waitFor(function() { - deferred.resolve(); - }, function() { - return connection.radioState == state; - }); - - return deferred.promise; -} - -function setRadioEnabled(enabled, transientState, finalState) { - log("setRadioEnabled to " + enabled); - - let deferred = Promise.defer(); - let done = function() { - deferred.resolve(); - }; - - let pending = ["onradiostatechange", "onsuccess"]; - - let receivedTransient = false; - connection.onradiostatechange = function() { - let state = connection.radioState; - log("Received 'radiostatechange' event, radioState: " + state); - - if (state == transientState) { - receivedTransient = true; - } else if (state == finalState) { - ok(receivedTransient); - receivedPending("onradiostatechange", pending, done); - } - }; - - let req = connection.setRadioEnabled(enabled); - - req.onsuccess = function() { - log("setRadioEnabled success"); - receivedPending("onsuccess", pending, done); - }; - - req.onerror = function() { - ok(false, "setRadioEnabled should not fail"); - deferred.reject(); - }; - - return deferred.promise; -} - -function testSwitchRadio() { - log("= testSwitchRadio ="); - return waitRadioState("enabled") - .then(setRadioEnabled.bind(null, false, "disabling", "disabled")) - .then(setRadioEnabled.bind(null, true, "enabling", "enabled")); -} - -function testDisableRadioWhenDataConnected() { - log("= testDisableRadioWhenDataConnected ="); - return waitRadioState("enabled") - .then(enableData) - .then(setRadioEnabled.bind(null, false, "disabling", "disabled")) + "types":["default","supl","mms"]}]]; + return setDataApnSettings(apnSettings); + }) + .then(() => setDataEnabledAndWait(true)) + .then(() => setRadioEnabledAndWait(false)) .then(() => { // Data should be disconnected. - is(connection.data.connected, false); + is(mobileConnection.data.connected, false); }) - .then(setRadioEnabled.bind(null, true, "enabling", "enabled")) - // Disable data - .then(setSetting.bind(null, DATA_KEY, false)); -} -function cleanUp() { - SpecialPowers.removePermission("mobileconnection", document); - SpecialPowers.removePermission("settings-write", document); - SpecialPowers.removePermission("settings-read", document); - SpecialPowers.clearUserPref("dom.mozSettings.enabled"); - finish(); -} + // Restore test environment. + .then(() => setDataApnSettings(origApnSettings)) + .then(() => setDataEnabled(false)) + .then(() => setRadioEnabledAndWait(true)); -testSwitchRadio() - .then(testDisableRadioWhenDataConnected) - .then(null, () => { - ok(false, "promise reject somewhere"); - }) - .then(cleanUp); +}, ["settings-read", "settings-write"]); From 8a6324de066e2e2842f2492d08d5f1ea8a90ac5d Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Thu, 19 Jun 2014 19:02:48 +0800 Subject: [PATCH 70/96] Bug 979134 (follow-up): convert test_mobile_signal_strength.js to Promise. r=vicamo --- dom/mobileconnection/tests/marionette/head.js | 88 +++++++++ .../tests/marionette/mobile_header.js | 60 ------ .../marionette/test_mobile_signal_strength.js | 184 +++++++----------- 3 files changed, 163 insertions(+), 169 deletions(-) delete mode 100644 dom/mobileconnection/tests/marionette/mobile_header.js diff --git a/dom/mobileconnection/tests/marionette/head.js b/dom/mobileconnection/tests/marionette/head.js index 4e74b35170ed..1524d234a73c 100644 --- a/dom/mobileconnection/tests/marionette/head.js +++ b/dom/mobileconnection/tests/marionette/head.js @@ -1007,6 +1007,94 @@ function setEmulatorOperatorNamesAndWait(aOperator, aLongName, aShortName, return Promise.all(promises); } +/** + * Set GSM signal strength. + * + * Fulfill params: (none) + * Reject params: (none) + * + * @param aRssi + * + * @return A deferred promise. + */ +function setEmulatorGsmSignalStrength(aRssi) { + let cmd = "gsm signal " + aRssi; + return runEmulatorCmdSafe(cmd); +} + +/** + * Set emulator GSM signal strength and wait for voice and/or data state change. + * + * Fulfill params: (none) + * + * @param aRssi + * @param aWaitVoice [optional] + * A boolean value. Default true. + * @param aWaitData [optional] + * A boolean value. Default false. + * + * @return A deferred promise. + */ +function setEmulatorGsmSignalStrengthAndWait(aRssi, + aWaitVoice = true, + aWaitData = false) { + let promises = []; + if (aWaitVoice) { + promises.push(waitForManagerEvent("voicechange")); + } + if (aWaitData) { + promises.push(waitForManagerEvent("datachange")); + } + promises.push(setEmulatorGsmSignalStrength(aRssi)); + return Promise.all(promises); +} + +/** + * Set LTE signal strength. + * + * Fulfill params: (none) + * Reject params: (none) + * + * @param aRxlev + * @param aRsrp + * @param aRssnr + * + * @return A deferred promise. + */ +function setEmulatorLteSignalStrength(aRxlev, aRsrp, aRssnr) { + let cmd = "gsm lte_signal " + aRxlev + " " + aRsrp + " " + aRssnr; + return runEmulatorCmdSafe(cmd); +} + +/** + * Set emulator LTE signal strength and wait for voice and/or data state change. + * + * Fulfill params: (none) + * + * @param aRxlev + * @param aRsrp + * @param aRssnr + * @param aWaitVoice [optional] + * A boolean value. Default true. + * @param aWaitData [optional] + * A boolean value. Default false. + * + * @return A deferred promise. + */ +function setEmulatorLteSignalStrengthAndWait(aRxlev, aRsrp, aRssnr, + aWaitVoice = true, + aWaitData = false) { + let promises = []; + if (aWaitVoice) { + promises.push(waitForManagerEvent("voicechange")); + } + if (aWaitData) { + promises.push(waitForManagerEvent("datachange")); + } + promises.push(setEmulatorLteSignalStrength(aRxlev, aRsrp, aRssnr)); + return Promise.all(promises); +} + let _networkManager; /** diff --git a/dom/mobileconnection/tests/marionette/mobile_header.js b/dom/mobileconnection/tests/marionette/mobile_header.js deleted file mode 100644 index 800dbae19edd..000000000000 --- a/dom/mobileconnection/tests/marionette/mobile_header.js +++ /dev/null @@ -1,60 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -SpecialPowers.addPermission("mobileconnection", true, document); - -// In single sim scenario, there is only one mobileConnection, we can always use -// the first instance. -let mobileConnection = window.navigator.mozMobileConnections[0]; -ok(mobileConnection instanceof MozMobileConnection, - "mobileConnection is instanceof " + mobileConnection.constructor); - -let _pendingEmulatorCmdCount = 0; - -/* Remove permission and execute finish() */ -let cleanUp = function() { - waitFor(function() { - SpecialPowers.removePermission("mobileconnection", document); - finish(); - }, function() { - return _pendingEmulatorCmdCount === 0; - }); -}; - -/* Helper for tasks */ -let taskHelper = { - tasks: [], - - push: function(task) { - this.tasks.push(task); - }, - - runNext: function() { - let task = this.tasks.shift(); - if (!task) { - cleanUp(); - return; - } - - if (typeof task === "function") { - task(); - } - }, -}; - -/* Helper for emulator console command */ -let emulatorHelper = { - sendCommand: function(cmd, callback) { - _pendingEmulatorCmdCount++; - runEmulatorCmd(cmd, function(results) { - _pendingEmulatorCmdCount--; - - let result = results[results.length - 1]; - is(result, "OK", "'"+ cmd +"' returns '" + result + "'"); - - if (callback && typeof callback === "function") { - callback(results); - } - }); - }, -}; diff --git a/dom/mobileconnection/tests/marionette/test_mobile_signal_strength.js b/dom/mobileconnection/tests/marionette/test_mobile_signal_strength.js index 4c7305aeb5b7..2245246c0132 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_signal_strength.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_signal_strength.js @@ -1,132 +1,98 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -MARIONETTE_TIMEOUT = 30000; -MARIONETTE_HEAD_JS = "mobile_header.js"; +MARIONETTE_TIMEOUT = 60000; +MARIONETTE_HEAD_JS = "head.js"; -/* Emulator command for GSM/UMTS signal strength */ -function setEmulatorGsmSignalStrength(rssi) { - emulatorHelper.sendCommand("gsm signal " + rssi); -} +// Emulator uses rssi = 7 as default value. +const DEFAULT_RSSI = 7; -/* Emulator command for LTE signal strength */ -function setEmulatorLteSignalStrength(rxlev, rsrp, rssnr) { - let lteSignal = rxlev + " " + rsrp + " " + rssnr; - emulatorHelper.sendCommand("gsm lte_signal " + lteSignal); -} - -function waitForVoiceChangeEvent(callback) { - mobileConnection.addEventListener("voicechange", function onvoicechange() { - mobileConnection.removeEventListener("voicechange", onvoicechange); - - if (callback && typeof callback === "function") { - callback(); +const TEST_DATA = [ + // All invalid case. + { + input: { + rxlev: 99, + rsrp: 65535, + rssnr: 65535 + }, + expect: { + signalStrength: null, + relSignalStrength: null } - }); -} + }, + // Valid rxlev with max value. + { + input: { + rxlev: 63, + rsrp: 65535, + rssnr: 65535 + }, + expect: { + signalStrength: -48, + relSignalStrength: 100 + } + }, + // Valid rxlev. + { + input: { + rxlev: 12, + rsrp: 65535, + rssnr: 65535 + }, + expect: { + signalStrength: -99, + relSignalStrength: 100 + } + }, + // Valid rxlev with min value. + { + input: { + rxlev: 0, + rsrp: 65535, + rssnr: 65535 + }, + expect: { + signalStrength: -111, + relSignalStrength: 0 + } + } +]; -/* Test Initial Signal Strength Info */ -taskHelper.push(function testInitialSignalStrengthInfo() { +function testInitialSignalStrengthInfo() { log("Test initial signal strength info"); let voice = mobileConnection.voice; // Android emulator initializes the signal strength to -99 dBm is(voice.signalStrength, -99, "check voice.signalStrength"); is(voice.relSignalStrength, 44, "check voice.relSignalStrength"); +} - taskHelper.runNext(); -}); +function testLteSignalStrength(aInput, aExpect) { + log("Test setting LTE signal strength to " + JSON.stringify(aInput)); -/* Test Unsolicited Signal Strength Events for LTE */ -taskHelper.push(function testLteSignalStrength() { - // Set emulator's LTE signal strength and wait for 'onvoicechange' event. - function doTestLteSignalStrength(input, expect, callback) { - log("Test LTE signal info with data : " + JSON.stringify(input)); - - waitForVoiceChangeEvent(function() { + return setEmulatorLteSignalStrengthAndWait(aInput.rxlev, aInput.rsrp, aInput.rssnr) + .then(() => { let voice = mobileConnection.voice; - is(voice.signalStrength, expect.signalStrength, + is(voice.signalStrength, aExpect.signalStrength, "check voice.signalStrength"); - is(voice.relSignalStrength, expect.relSignalStrength, + is(voice.relSignalStrength, aExpect.relSignalStrength, "check voice.relSignalStrength"); - - if (callback && typeof callback === "function") { - callback(); - } }); +} - setEmulatorLteSignalStrength(input.rxlev, input.rsrp, input.rssnr); +// Start tests +startTestCommon(function() { + // Test initial status + testInitialSignalStrengthInfo(); + + // Test Unsolicited Signal Strength Events for LTE + let promise = Promise.resolve(); + for (let i = 0; i < TEST_DATA.length; i++) { + let data = TEST_DATA[i]; + promise = promise.then(() => testLteSignalStrength(data.input, + data.expect)); } - let testData = [ - // All invalid case. - {input: { - rxlev: 99, - rsrp: 65535, - rssnr: 65535}, - expect: { - signalStrength: null, - relSignalStrength: null} - }, - // Valid rxlev with max value. - {input: { - rxlev: 63, - rsrp: 65535, - rssnr: 65535}, - expect: { - signalStrength: -48, - relSignalStrength: 100} - }, - // Valid rxlev. - {input: { - rxlev: 12, - rsrp: 65535, - rssnr: 65535}, - expect: { - signalStrength: -99, - relSignalStrength: 100} - }, - // Valid rxlev with min value. - {input: { - rxlev: 0, - rsrp: 65535, - rssnr: 65535}, - expect: { - signalStrength: -111, - relSignalStrength: 0} - } - ]; - - // Run all test data. - (function do_call() { - let next = testData.shift(); - if (!next) { - taskHelper.runNext(); - return; - } - doTestLteSignalStrength(next.input, next.expect, do_call); - })(); + // Reset Signal Strength Info to default + return promise.then(() => setEmulatorGsmSignalStrengthAndWait(DEFAULT_RSSI)); }); - -/* Reset Signal Strength Info to default, and finsih the test */ -taskHelper.push(function testResetSignalStrengthInfo() { - // Reset emulator's signal strength and wait for 'onvoicechange' event. - function doResetSignalStrength(rssi) { - waitForVoiceChangeEvent(function() { - let voice = mobileConnection.voice; - is(voice.signalStrength, -99, "check voice.signalStrength"); - is(voice.relSignalStrength, 44, "check voice.relSignalStrength"); - - taskHelper.runNext(); - }); - - setEmulatorGsmSignalStrength(rssi); - } - - // Emulator uses rssi = 7 as default value, and we need to reset it after - // finishing test in case other test cases need those values for testing. - doResetSignalStrength(7); -}); - -// Start test -taskHelper.runNext(); From 1261fe03b97f1e3eb0448f9f09d069582150e51f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 23:05:26 -0700 Subject: [PATCH 71/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/a2fd2ba30041 Author: Fernando Rodríguez Sela Desc: Merge pull request #19762 from frsela/STK/Bug1015833 Bug 1015833 - [PTCRB][STK]27.22.4.1.1/2 DISPLAY TEXT, normal priority, Unpacked 8 bit data for Text String, screen busy case failed, r=vingtetun ======== https://hg.mozilla.org/integration/gaia-central/rev/ee255dd3910f Author: Fernando Rodriguez Sela Desc: Bug 1015833 - [PTCRB][STK]27.22.4.1.1/2 DISPLAY TEXT, normal priority, Unpacked 8 bit data for Text String, screen busy case failed, r=vingtetun --- 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 a746b30d7aa3..d42723702aae 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b7162b41e218d72b9b7543d9b8f4639fd39baf88", + "revision": "a2fd2ba30041fee39ab8f3eb6e43fa6a8ac95854", "repo_path": "/integration/gaia-central" } From fe284c937c08f0da3a39ed82cae56f50f90518fb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 23:11:38 -0700 Subject: [PATCH 72/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ff630b326a3b..d42d8ab0bb5a 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 d9b9930f34e3..235f577bb066 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 1e6f8497b40e..bd68973f7356 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 ff630b326a3b..d42d8ab0bb5a 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 9ba251a28a4d..5653db8922d6 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 f720a886032c..221c99d60c48 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 9f37a0671676..1f45ab5f4782 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 d7579ff28b1d..03871a7dda2d 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 5983cfece6bd..56a4c777eed9 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 93bb2b10b17058fa4a2a6c8a8f35840373669192 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 23:20:26 -0700 Subject: [PATCH 73/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/be6a331fe0b7 Author: Cristian Rodriguez Desc: Merge pull request #20403 from yzen/bug-997240 Bug 997240 - added proper screen reader semantics to the homescreen's pa... ======== https://hg.mozilla.org/integration/gaia-central/rev/233ac142fe24 Author: Yura Zenevich Desc: Bug 997240 - added proper screen reader semantics to the homescreen's pagination bar. --- 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 d42723702aae..54257ff59e67 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "a2fd2ba30041fee39ab8f3eb6e43fa6a8ac95854", + "revision": "be6a331fe0b70f8cba4ec3c5114ea2c1e603f428", "repo_path": "/integration/gaia-central" } From ad8e4d7912f7cf9ae35ce68756e8b84de9be045c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 22 Jun 2014 23:26:38 -0700 Subject: [PATCH 74/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d42d8ab0bb5a..744cad08eddd 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 235f577bb066..b30c8039ef74 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 bd68973f7356..0747bc04af45 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 d42d8ab0bb5a..744cad08eddd 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 5653db8922d6..27b8fa973e7c 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 221c99d60c48..347b39e485fa 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 1f45ab5f4782..c697f6fc54e7 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 03871a7dda2d..2d0e2057932d 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 56a4c777eed9..fad044ec8c3c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c57c3a69f37e1468a084e60dc9bf3f393468d8ed Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 00:05:27 -0700 Subject: [PATCH 75/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/61012623f81e Author: Germán Toro del Valle Desc: Merge pull request #19918 from gtorodelvalle/dialer-callscreen-bug-1007709-fluid-font-size Bug 1007709 - [Dialer][Call Screen] Create fluid size for contact name in the upper information panel ======== https://hg.mozilla.org/integration/gaia-central/rev/d2fba0ebb054 Author: German Toro del Valle Desc: Bug 1007709 - [Dialer][Call Screen] Create fluid size for contact name in the upper information panel --- 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 54257ff59e67..f2dd28570649 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "be6a331fe0b70f8cba4ec3c5114ea2c1e603f428", + "revision": "61012623f81eed0e2967c715867581dcccdd999b", "repo_path": "/integration/gaia-central" } From 9cc704f206e2e2e7a4e70774e98d513562bb3243 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 00:11:11 -0700 Subject: [PATCH 76/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 744cad08eddd..4320c33544f5 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 b30c8039ef74..5280653c76fa 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 0747bc04af45..7caaae6026e0 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 744cad08eddd..4320c33544f5 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 27b8fa973e7c..e41c7f69fab1 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 347b39e485fa..2dda02b7e9c0 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 c697f6fc54e7..4de776d729a6 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 2d0e2057932d..97cfb2583c07 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 fad044ec8c3c..e81049c3b8e0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From caf25bb7820d8cfbfeb0b0e6c12c9fe369735a24 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 00:30:27 -0700 Subject: [PATCH 77/96] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/4f307a26ba9f Author: Jose M. Cantera Desc: Merge pull request #20789 from jmcanterafonseca/fix_date_birthday Bug 1027867 - [B2G][Contacts] When editing a contact, the Birthday and A... ======== https://hg.mozilla.org/integration/gaia-central/rev/98de125518d6 Author: José Manuel Cantera Desc: Bug 1027867 - [B2G][Contacts] When editing a contact, the Birthday and Anniversary dropdowns say 'Date' instead of the date that was selected when creating the contact ======== https://hg.mozilla.org/integration/gaia-central/rev/8fdf8c041029 Author: Jose M. Cantera Desc: Merge pull request #20801 from jmcanterafonseca/fix_sim_dups_another Bug 1028106 - Invalid information of automated merged contacts and conta... ======== https://hg.mozilla.org/integration/gaia-central/rev/5b5ae8543313 Author: José Manuel Cantera Desc: Bug 1028106 - Invalid information of automated merged contacts and contact duplicate --- 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 f2dd28570649..945ded023425 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "61012623f81eed0e2967c715867581dcccdd999b", + "revision": "4f307a26ba9f475757d2d49a095c2e77f8b6d302", "repo_path": "/integration/gaia-central" } From e7308e5eb64dcccc08a4bca12841663a217237c8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 00:36:12 -0700 Subject: [PATCH 78/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4320c33544f5..5d4cbdcf37af 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 5280653c76fa..5034e533ea44 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 7caaae6026e0..fe6094d2cdb1 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 4320c33544f5..5d4cbdcf37af 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 e41c7f69fab1..68db393d3cf0 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 2dda02b7e9c0..889b4ae5166b 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 4de776d729a6..e5fac115803f 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 97cfb2583c07..ed6f55059b46 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 e81049c3b8e0..484586b05c8f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 146c22dd2aa1be9bf47bd2ee3a0b5e42ee661e40 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 01:40:26 -0700 Subject: [PATCH 79/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/744ef12d9760 Author: Cristian Rodriguez Desc: Merge pull request #20878 from crdlc/bug-1028685 Bug 1028685 - [Collection app] Edit header obscured ======== https://hg.mozilla.org/integration/gaia-central/rev/f12b5fc7a103 Author: crdlc Desc: Bug 1028685 - [Collection app] Edit header obscured --- 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 945ded023425..17166db33a75 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "4f307a26ba9f475757d2d49a095c2e77f8b6d302", + "revision": "744ef12d9760c2816fe8dd0a066bbdf103d5e5e1", "repo_path": "/integration/gaia-central" } From b0ef4f3bff558d59b46ae029085ce9d2e4be27c5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 01:46:42 -0700 Subject: [PATCH 80/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 5d4cbdcf37af..fdcfff874c64 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 5034e533ea44..7e60d2bd3578 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 fe6094d2cdb1..81a82560b68c 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 5d4cbdcf37af..fdcfff874c64 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 68db393d3cf0..eaeeb21011b4 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 889b4ae5166b..266c74517986 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 e5fac115803f..21b62bb63cb1 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 ed6f55059b46..fa87abe8e92a 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 484586b05c8f..62e93c515536 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2fb3d9f1a5cacdef431cdb7a82b5e3431ef6cb22 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 01:55:27 -0700 Subject: [PATCH 81/96] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7a895dbd45d2 Author: Jon Hylands Desc: Bug 1023877 - Fixed reference workloads to work on flame. r=dhunt --- 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 17166db33a75..c77cb9893daa 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "744ef12d9760c2816fe8dd0a066bbdf103d5e5e1", + "revision": "7a895dbd45d26496e3a4c8af77fc42682252a89c", "repo_path": "/integration/gaia-central" } From fc665f51279cae216d69eea3c8f7193e98ff975a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 02:01:40 -0700 Subject: [PATCH 82/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fdcfff874c64..4c3aa8d9cad0 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 7e60d2bd3578..a8bfef99acee 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 81a82560b68c..8dbfb27c484e 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 fdcfff874c64..4c3aa8d9cad0 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 eaeeb21011b4..ad2e4799653a 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 266c74517986..e31d508ea8b6 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 21b62bb63cb1..e6f3e4606d72 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 fa87abe8e92a..19c27c062a7b 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 62e93c515536..6dc860ad5b08 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e654e11fe49e8e897dad64bab05655a376a83b8e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 02:25:32 -0700 Subject: [PATCH 83/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/336bb1363ec1 Author: EragonJ Desc: Merge pull request #20404 from EragonJ/bug-968677 Bug 968677 - [settings] add marionette test for Messaging Settings panel ======== https://hg.mozilla.org/integration/gaia-central/rev/9efb8cc11c11 Author: EragonJ Desc: Bug 968677 - [settings] add marionette test for Messaging Settings panel --- 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 c77cb9893daa..1e0b466057d8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "7a895dbd45d26496e3a4c8af77fc42682252a89c", + "revision": "336bb1363ec1def07a408461297d7651248a55c3", "repo_path": "/integration/gaia-central" } From de0772041e4ba14eb4acdd5ebbaaed70900a5b4a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 02:31:14 -0700 Subject: [PATCH 84/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4c3aa8d9cad0..c48a977ee103 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 a8bfef99acee..0de91275f8c7 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 8dbfb27c484e..3b31e12aa1b7 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 4c3aa8d9cad0..c48a977ee103 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 ad2e4799653a..ac344cdcea01 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 e31d508ea8b6..a1560cc57279 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 e6f3e4606d72..ba81d022522e 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 19c27c062a7b..82b403258915 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 6dc860ad5b08..ecee15ea932d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2384149b32b3fa77a717969d01cb40203499ce63 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 04:15:30 -0700 Subject: [PATCH 85/96] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/78519c0cfe8f Author: BavarianTomcat Desc: Revert "Bug 1007709 - [Dialer][Call Screen] Create fluid size for contact name in the upper information panel" for gaia unit test failures This reverts commit 70e78c013d3b1d3f461fb5c23c724c177c8dc3c4. --- 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 1e0b466057d8..9dc9ca69a8d6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "336bb1363ec1def07a408461297d7651248a55c3", + "revision": "78519c0cfe8f912f28cf21521ebb167aba714657", "repo_path": "/integration/gaia-central" } From bab5194a322481f5a7954db39258f363fb5efc3b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 04:21:13 -0700 Subject: [PATCH 86/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c48a977ee103..1c2fbade3edb 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 0de91275f8c7..4d297c02bfc4 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 3b31e12aa1b7..44825fa95474 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 c48a977ee103..1c2fbade3edb 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 ac344cdcea01..c73ffb2edce6 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 a1560cc57279..e73236bcc161 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 ba81d022522e..a57014d72321 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 82b403258915..e8d5ea980983 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 ecee15ea932d..9cb712b96613 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d37279d7c909cd3a58d3f467aa68d54138e2b9b5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 04:41:43 -0700 Subject: [PATCH 87/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1c2fbade3edb..8f524de3eab4 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 4d297c02bfc4..616a951ca192 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 44825fa95474..6e53914110a1 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 1c2fbade3edb..8f524de3eab4 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 c73ffb2edce6..20b28e10576d 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 e73236bcc161..34883a233834 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 e8d5ea980983..fa1a4d13d6ac 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 9cb712b96613..2014e266ec54 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -22,7 +22,7 @@ - + From 81c8fc753e3c2a40e2e9987484f9a462ad2f18e2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 04:45:29 -0700 Subject: [PATCH 88/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/279981719dfd Author: Rudy Lu Desc: Merge pull request #20891 from RudyLu/keyboard/Bug1028551_commit Bug 1028551 - Add "da" danish to keyboard-layouts.json. r=rudylu ======== https://hg.mozilla.org/integration/gaia-central/rev/cda7575b21fc Author: scootergrisen Desc: Bug 1028551 - Add "da" danish to keyboard-layouts.json. --- 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 9dc9ca69a8d6..61e7ee537b6c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "78519c0cfe8f912f28cf21521ebb167aba714657", + "revision": "279981719dfd83bfe2724db11a93fb9fbe7ec832", "repo_path": "/integration/gaia-central" } From fc0f23b32d117ad89df6f75de4a1abda698cc34f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 04:51:11 -0700 Subject: [PATCH 89/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 8f524de3eab4..d850a3067e93 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 616a951ca192..5ea116f1ac62 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 6e53914110a1..b2bb13718125 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 8f524de3eab4..d850a3067e93 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 20b28e10576d..61733ab4817b 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 34883a233834..e39cd4e76f7e 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 a57014d72321..737cae59e434 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 fa1a4d13d6ac..03d599913de9 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 2014e266ec54..6076811905dd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e70a0a31d3271aaac6bc54d06056130ba0585000 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 04:56:47 -0700 Subject: [PATCH 90/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 4 ++-- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/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 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d850a3067e93..87fe184e5810 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 5ea116f1ac62..c1208aa8a740 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -18,7 +18,7 @@ - + @@ -128,7 +128,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b2bb13718125..869617224ded 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d850a3067e93..87fe184e5810 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 61733ab4817b..ef08e5b099eb 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e39cd4e76f7e..4938e0cf3939 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 737cae59e434..a85e0ea2dbd7 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -16,7 +16,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 03d599913de9..2932970394e1 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 6076811905dd..ffd8bb03150a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -18,7 +18,7 @@ - + From de900197d9648f2fa104303a2ffb2e1282c2b584 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 05:00:26 -0700 Subject: [PATCH 91/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8533045319a0 Author: Carsten Book Desc: Merge pull request #20810 from flodolo/bug1028250 Bug 1028250 - [contacts] Remove unused strings custom.placeholder. r=francisco ======== https://hg.mozilla.org/integration/gaia-central/rev/14b45f78e008 Author: Francesco Lodolo (:flod) Desc: Bug 1028250 - [contacts] Remove unused strings custom.placeholder --- 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 61e7ee537b6c..b22d35005240 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "279981719dfd83bfe2724db11a93fb9fbe7ec832", + "revision": "8533045319a0c5f40fb3df46559ebed99bbab731", "repo_path": "/integration/gaia-central" } From 3717cf972851cde4ac523ece8186adae58c47372 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 05:01:47 -0700 Subject: [PATCH 92/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 87fe184e5810..027a35fe91bd 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 c1208aa8a740..801cccf892fb 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 869617224ded..1dc233bbe0ea 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 87fe184e5810..027a35fe91bd 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 ef08e5b099eb..3c1a00852011 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 4938e0cf3939..33a5b15e7cda 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 a85e0ea2dbd7..408946e23bb7 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 2932970394e1..e5ad2cc2f5af 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 ffd8bb03150a..c002480c3409 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 95ab1a56330513b748b6b381d42fb7a4b5ac98e3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 05:25:26 -0700 Subject: [PATCH 93/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b20987909575 Author: Arnau Desc: Merge pull request #20876 from pacorampas/aligment-buttons-oncall-1028126 Bug 1028126 - [Dialer][Call screen] In incoming call the buttons haven't a good alignment r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/902ef029096d Author: Paco Rampas Desc: Bug 1028126 - [Dialer][Call screen] In incoming call the buttons haven't a good alignment --- 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 b22d35005240..7cab3d206c67 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "8533045319a0c5f40fb3df46559ebed99bbab731", + "revision": "b20987909575c05ac89450874eab2bf565a1a6bc", "repo_path": "/integration/gaia-central" } From 1099aeb547a5ab2f357a7e3d2795f245ce4fec3c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 05:31:51 -0700 Subject: [PATCH 94/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 027a35fe91bd..627e45f0ccf3 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 801cccf892fb..2b32e86b0195 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 1dc233bbe0ea..a00d47beb6f9 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 027a35fe91bd..627e45f0ccf3 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 3c1a00852011..902d800c190c 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 33a5b15e7cda..27f8c84c13b8 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 408946e23bb7..0ba3a7d2ef19 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 e5ad2cc2f5af..4fd074da2133 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 c002480c3409..7f26b710df54 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 9212799e08b1d2a867e0c80f7d4d73a30a56fb8e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 05:40:26 -0700 Subject: [PATCH 95/96] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/aba00cfd579c Author: Etienne Segonzac Desc: Merge pull request #20664 from anefzaoui/bug-888815 Bug 888815 - [RTL] Notification stamp r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/407bb138e6ad Author: Ahmed Nefzaoui Desc: Bug 888815 - [RTL] Notification stamp --- 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 7cab3d206c67..d463fc886e52 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "b20987909575c05ac89450874eab2bf565a1a6bc", + "revision": "aba00cfd579caaf205e05c269f0a8100f242f39c", "repo_path": "/integration/gaia-central" } From 780344c15f296c665b90d6e797d3151791823487 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 23 Jun 2014 05:46:43 -0700 Subject: [PATCH 96/96] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 627e45f0ccf3..081a5c00ce69 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 2b32e86b0195..717cd3e1f87f 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 a00d47beb6f9..186773001fae 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 627e45f0ccf3..081a5c00ce69 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 902d800c190c..95231a68e89c 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 27f8c84c13b8..19783da844ec 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 0ba3a7d2ef19..de8a57da2cec 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 4fd074da2133..ed3ca81f87c7 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 7f26b710df54..e21ac3690f40 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +