From ccea6d8b6e05876cacceef48feae239e54334dd8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 03:05:32 -0700 Subject: [PATCH 01/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/13bc1de946da Author: Greg Weng Desc: Merge pull request #22800 from snowmantw/issue1043892-rev2 Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 104... ======== https://hg.mozilla.org/integration/gaia-central/rev/db5a66a953f9 Author: Greg Weng Desc: Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 1043821, with panel switching refactoring --- 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 a36c2c66fe81..9d64ebec6a63 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "03a4bc3b7d10bcc197511ac7accdb05346a0b9dd", + "revision": "13bc1de946da955de7dc74829d1bbc3e005360f7", "repo_path": "/integration/gaia-central" } From aa4c5cf4e81eba7567d0d9203398b9fa9635186d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 03:11:24 -0700 Subject: [PATCH 02/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 58c4f2a5d430..554cfc78ffe1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 714638e35849..65ff9d5143f5 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 8aa084620078..527a4a10b197 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 a35b1ceea7ab..4d84ac3fc8b4 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 714638e35849..65ff9d5143f5 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 40c6463b062d..018ee795a9cb 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 92a263e78397..4644fce33f81 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 35e54351846c..b55a5d9e3589 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 c52b02093961..34f3c3f12170 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 c080b1a2a733..b8e1e484963f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d54f76dd2545d621adb4245eedf29ae277d8bf2d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 03:35:28 -0700 Subject: [PATCH 03/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6a6a9878f8a9 Author: Andrew Sutherland Desc: Merge pull request #23058 from asutherland/email-unread-msgs-backend Bug 800402 - [email/backend] UI: Show the number of unread messages in the message-list header after the folder name. r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/310a982044cb Author: Alex Wissmann Desc: Bug 800402 - [email/backend] UI: Show the number of unread messages in the message-list header after the folder name. r=asuth Land the back-end parts of bug 800402 and bug 888955 which it depends on. The UI parts are separable and we're landing the back-end stuff on its own to avoid back-end bit-rot. The changes in here exactly correspond to those in: https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/328 --- 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 9d64ebec6a63..80a8bf17cbe4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "13bc1de946da955de7dc74829d1bbc3e005360f7", + "revision": "6a6a9878f8a9a949bcc451ee3f2d54bb0a628a73", "repo_path": "/integration/gaia-central" } From 838f57b04115e8d332415e89f6964b0e95ece49b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 03:37:01 -0700 Subject: [PATCH 04/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 554cfc78ffe1..7bb4ebe29fc1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 65ff9d5143f5..e3bdb95ae550 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 527a4a10b197..68b380524b40 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 4d84ac3fc8b4..bb44e9510c27 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 65ff9d5143f5..e3bdb95ae550 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 018ee795a9cb..f7150d7f2088 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 4644fce33f81..22de08dbde9b 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 b55a5d9e3589..1a6d5b7c6ae0 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 34f3c3f12170..007d14cbedbd 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 b8e1e484963f..3471eee134fd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From cc0a0ad35a785bf3614c3d91f75f5ee13e2515e7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 03:50:30 -0700 Subject: [PATCH 05/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/797dfb9325a4 Author: Zac Desc: Merge pull request #23037 from gregarndt/gaia_sanity_tests Bug 1054333 - Create Firefox OS test job for testing phone specific feat... ======== https://hg.mozilla.org/integration/gaia-central/rev/661d6674c7c4 Author: Greg Arndt Desc: Bug 1054333 - Create Firefox OS test job for testing phone specific features per checkin --- 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 80a8bf17cbe4..bf8f95c85351 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "6a6a9878f8a9a949bcc451ee3f2d54bb0a628a73", + "revision": "797dfb9325a48197ca10ae65d7dfb0bf5e1b4545", "repo_path": "/integration/gaia-central" } From 43339bb1b1ab358000519ca03e12ec94dc405487 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 03:56:21 -0700 Subject: [PATCH 06/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 7bb4ebe29fc1..f71d1a7869b6 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e3bdb95ae550..0e1d8688cf27 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 68b380524b40..4a6e2e5d3eda 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 bb44e9510c27..31ad857651b9 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 e3bdb95ae550..0e1d8688cf27 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 f7150d7f2088..63d807d2008d 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 22de08dbde9b..66c79c88cf0d 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 1a6d5b7c6ae0..81aafad571ca 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 007d14cbedbd..b72a9264f6a2 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 3471eee134fd..11ef41e8dc5d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 96f0db44181367400e77976ba759b628925e06ea Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 04:35:31 -0700 Subject: [PATCH 07/19] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/bac0d2577cf0 Author: Zac Desc: Merge pull request #22923 from zacc/bug_1049489_contacts_api Bug 1049489 - gaiatest: execute all ContactsAPI calls in chrome context ======== https://hg.mozilla.org/integration/gaia-central/rev/611b2073d924 Author: Zac Desc: Bug 1049489 - gaiatest: execute all ContactsAPI calls in chrome context ======== https://hg.mozilla.org/integration/gaia-central/rev/3df222b83197 Author: Rudy Lu Desc: Merge pull request #23069 from RudyLu/keyboard/Bug1055972-disable_keyboard_uninstallation_test Bug 1055972 - disable keyboard uninstallation test. r=test-only ======== https://hg.mozilla.org/integration/gaia-central/rev/7317e2fd901c Author: Rudy Lu Desc: Bug 1055972 - disable keyboard uninstallation test. - apps/keyboard/test/marionette/uninstallation_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/5f63abfdea18 Author: Zac Desc: Merge pull request #22195 from zacc/bug_1044484 Bug 1044484 - Re-jig the gaia-ui-tests manifests to obsolete tbpl-manife... ======== https://hg.mozilla.org/integration/gaia-central/rev/5af1c31c2088 Author: Zac Desc: Bug 1044484 - Add an external tag to gaiatest manifests to denote tests use of external internet resources --- 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 bf8f95c85351..c16311e4b84d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "797dfb9325a48197ca10ae65d7dfb0bf5e1b4545", + "revision": "bac0d2577cf06c7141b58669b38aa0f1e3f72da2", "repo_path": "/integration/gaia-central" } From f4ed64f96baa0ff1af6c97b8cd92fee5a1de1bd1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 04:41:23 -0700 Subject: [PATCH 08/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f71d1a7869b6..378aaa24b958 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0e1d8688cf27..429694e35c79 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 4a6e2e5d3eda..52cdf7cf5d0c 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 31ad857651b9..50200b1e001c 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 0e1d8688cf27..429694e35c79 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 63d807d2008d..faf4b35259b1 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 66c79c88cf0d..0b0b0e5a1d18 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 81aafad571ca..aac441263e66 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 b72a9264f6a2..831f2dac6357 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 11ef41e8dc5d..7d897ab0355f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3cf458ed1ec44b493258fa1aa55a96ff39ced4fe Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 05:05:32 -0700 Subject: [PATCH 09/19] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c825faf613ce Author: Ed Morley Desc: Revert "Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 1043821, with panel switching refactoring" for test failures This reverts commit a47e7934f4793d24723d1d340608bd6e0bc1fc8d. --- 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 c16311e4b84d..0a350bebb301 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "bac0d2577cf06c7141b58669b38aa0f1e3f72da2", + "revision": "c825faf613ce62efc49c9b1f80af2546b1be25cf", "repo_path": "/integration/gaia-central" } From e6379fb63622c77fcb5045bdbdf8543d4b4fd465 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 05:11:31 -0700 Subject: [PATCH 10/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 378aaa24b958..c702063a73c3 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 429694e35c79..3222c406155d 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 52cdf7cf5d0c..233633feb90a 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 50200b1e001c..1f43adcb6875 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 429694e35c79..3222c406155d 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 faf4b35259b1..134a5d50ced3 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 0b0b0e5a1d18..f867418122dd 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 aac441263e66..d9592d6a07cc 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 831f2dac6357..1791d82b09be 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 7d897ab0355f..f9c1a13a588f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From fabc7ec957cd50a7f0f11a5cec183f709eba9cc7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 05:30:30 -0700 Subject: [PATCH 11/19] 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/a098afe913e3 Author: Cristian Rodriguez Desc: Merge pull request #23032 from ADLR-es/fix-bug-1045236 Bug 1045236 - contacts import screen has a strange notion of "TODAY", which includes yesterday ======== https://hg.mozilla.org/integration/gaia-central/rev/3653d2105f35 Author: Adrián de la Rosa Desc: Bug 1045236 - contacts import screen has a strange notion of "TODAY", which includes yesterday --- 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 0a350bebb301..3b1483b79a03 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "c825faf613ce62efc49c9b1f80af2546b1be25cf", + "revision": "a098afe913e391506fd90ec702e2a0b1ee896b9d", "repo_path": "/integration/gaia-central" } From 881a16d23126654e4893c1cf4659f4cd3a3ac64d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 05:36:29 -0700 Subject: [PATCH 12/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index c702063a73c3..34cf96ca8aa1 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3222c406155d..158d702e5103 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 233633feb90a..1968e2f01ef6 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 1f43adcb6875..beb146c8ae38 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 3222c406155d..158d702e5103 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 134a5d50ced3..c20456e16abf 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 f867418122dd..f6a8c87e178c 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 d9592d6a07cc..2adbe1ba338e 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 1791d82b09be..0ebd2da18932 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 f9c1a13a588f..d7abb617a92f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From dc0928b9d6e3cf3748ec70a93b568e556773e1a4 Mon Sep 17 00:00:00 2001 From: Randy Lin Date: Wed, 20 Aug 2014 10:25:55 +0800 Subject: [PATCH 13/19] Bug 1054219 - [B2G][SpeakerManager] Avoid to create unnecessary speakerManager instance on child process. r=baku --- dom/ipc/ContentChild.cpp | 1 + dom/ipc/ContentParent.cpp | 16 +++---- dom/speakermanager/SpeakerManager.cpp | 46 +++++++++---------- dom/speakermanager/SpeakerManagerService.cpp | 18 ++++++-- dom/speakermanager/SpeakerManagerService.h | 9 +++- .../SpeakerManagerServiceChild.cpp | 13 +++++- .../SpeakerManagerServiceChild.h | 8 ++++ 7 files changed, 74 insertions(+), 37 deletions(-) diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index d4adbb1aa98e..dc4e612e4f38 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -944,6 +944,7 @@ bool ContentChild::RecvSpeakerManagerNotify() { #ifdef MOZ_WIDGET_GONK + // Only notify the process which has the SpeakerManager instance. nsRefPtr service = SpeakerManagerService::GetSpeakerManagerService(); if (service) { diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 99f7499067cb..8f8f447a66ca 100755 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -3219,10 +3219,10 @@ ContentParent::RecvSpeakerManagerGetSpeakerStatus(bool* aValue) #ifdef MOZ_WIDGET_GONK *aValue = false; nsRefPtr service = - SpeakerManagerService::GetSpeakerManagerService(); - if (service) { - *aValue = service->GetSpeakerStatus(); - } + SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + + *aValue = service->GetSpeakerStatus(); return true; #endif return false; @@ -3233,10 +3233,10 @@ ContentParent::RecvSpeakerManagerForceSpeaker(const bool& aEnable) { #ifdef MOZ_WIDGET_GONK nsRefPtr service = - SpeakerManagerService::GetSpeakerManagerService(); - if (service) { - service->ForceSpeaker(aEnable, mChildID); - } + SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + service->ForceSpeaker(aEnable, mChildID); + return true; #endif return false; diff --git a/dom/speakermanager/SpeakerManager.cpp b/dom/speakermanager/SpeakerManager.cpp index 6df0a40ff4ae..1f418769a4e6 100644 --- a/dom/speakermanager/SpeakerManager.cpp +++ b/dom/speakermanager/SpeakerManager.cpp @@ -27,18 +27,17 @@ SpeakerManager::SpeakerManager() { SetIsDOMBinding(); SpeakerManagerService *service = - SpeakerManagerService::GetSpeakerManagerService(); - if (service) { - service->RegisterSpeakerManager(this); - } + SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + service->RegisterSpeakerManager(this); } SpeakerManager::~SpeakerManager() { - SpeakerManagerService *service = SpeakerManagerService::GetSpeakerManagerService(); - if (service) { - service->UnRegisterSpeakerManager(this); - } + SpeakerManagerService *service = SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + + service->UnRegisterSpeakerManager(this); nsCOMPtr target = do_QueryInterface(GetOwner()); NS_ENSURE_TRUE_VOID(target); @@ -55,11 +54,10 @@ SpeakerManager::Speakerforced() if (mForcespeaker && !mVisible) { return false; } - SpeakerManagerService *service = SpeakerManagerService::GetSpeakerManagerService(); - if (service) { - return service->GetSpeakerStatus(); - } - return false; + SpeakerManagerService *service = SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + return service->GetSpeakerStatus(); + } bool @@ -71,10 +69,10 @@ SpeakerManager::Forcespeaker() void SpeakerManager::SetForcespeaker(bool aEnable) { - SpeakerManagerService *service = SpeakerManagerService::GetSpeakerManagerService(); - if (service) { - service->ForceSpeaker(aEnable, mVisible); - } + SpeakerManagerService *service = SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + + service->ForceSpeaker(aEnable, mVisible); mForcespeaker = aEnable; } @@ -192,8 +190,10 @@ SpeakerManager::HandleEvent(nsIDOMEvent* aEvent) // switches to true in all apps. I.e. the app doesn't have to // call forcespeaker=true again when it comes into foreground. SpeakerManagerService *service = - SpeakerManagerService::GetSpeakerManagerService(); - if (service && mVisible && mForcespeaker) { + SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + + if (mVisible && mForcespeaker) { service->ForceSpeaker(mForcespeaker, mVisible); } // If an application that has called forcespeaker=true, but no audio is @@ -214,10 +214,10 @@ SpeakerManager::SetAudioChannelActive(bool isActive) { if (!isActive && !mVisible) { SpeakerManagerService *service = - SpeakerManagerService::GetSpeakerManagerService(); - if (service) { - service->ForceSpeaker(false, mVisible); - } + SpeakerManagerService::GetOrCreateSpeakerManagerService(); + MOZ_ASSERT(service); + + service->ForceSpeaker(false, mVisible); } } diff --git a/dom/speakermanager/SpeakerManagerService.cpp b/dom/speakermanager/SpeakerManagerService.cpp index f44ab59bba15..f35a81b150c6 100644 --- a/dom/speakermanager/SpeakerManagerService.cpp +++ b/dom/speakermanager/SpeakerManagerService.cpp @@ -26,12 +26,12 @@ StaticRefPtr gSpeakerManagerService; // static SpeakerManagerService* -SpeakerManagerService::GetSpeakerManagerService() +SpeakerManagerService::GetOrCreateSpeakerManagerService() { MOZ_ASSERT(NS_IsMainThread()); if (XRE_GetProcessType() != GeckoProcessType_Default) { - return SpeakerManagerServiceChild::GetSpeakerManagerService(); + return SpeakerManagerServiceChild::GetOrCreateSpeakerManagerService(); } // If we already exist, exit early @@ -41,9 +41,21 @@ SpeakerManagerService::GetSpeakerManagerService() // Create new instance, register, return nsRefPtr service = new SpeakerManagerService(); - NS_ENSURE_TRUE(service, nullptr); gSpeakerManagerService = service; + + return gSpeakerManagerService; +} + +SpeakerManagerService* +SpeakerManagerService::GetSpeakerManagerService() +{ + MOZ_ASSERT(NS_IsMainThread()); + + if (XRE_GetProcessType() != GeckoProcessType_Default) { + return SpeakerManagerServiceChild::GetSpeakerManagerService(); + } + return gSpeakerManagerService; } diff --git a/dom/speakermanager/SpeakerManagerService.h b/dom/speakermanager/SpeakerManagerService.h index cc324ec897e2..23d12e845a13 100644 --- a/dom/speakermanager/SpeakerManagerService.h +++ b/dom/speakermanager/SpeakerManagerService.h @@ -23,8 +23,15 @@ class SpeakerManagerService : public nsIObserver public: NS_DECL_ISUPPORTS NS_DECL_NSIOBSERVER - + /* + * Return null or instance which has been created. + */ static SpeakerManagerService* GetSpeakerManagerService(); + /* + * Return SpeakerManagerService instance. + * If SpeakerManagerService is not exist, create and return new one. + */ + static SpeakerManagerService* GetOrCreateSpeakerManagerService(); virtual void ForceSpeaker(bool aEnable, bool aVisible); virtual bool GetSpeakerStatus(); virtual void SetAudioChannelActive(bool aIsActive); diff --git a/dom/speakermanager/SpeakerManagerServiceChild.cpp b/dom/speakermanager/SpeakerManagerServiceChild.cpp index 988c03e12888..a819d6fdadfa 100644 --- a/dom/speakermanager/SpeakerManagerServiceChild.cpp +++ b/dom/speakermanager/SpeakerManagerServiceChild.cpp @@ -22,7 +22,7 @@ StaticRefPtr gSpeakerManagerServiceChild; // static SpeakerManagerService* -SpeakerManagerServiceChild::GetSpeakerManagerService() +SpeakerManagerServiceChild::GetOrCreateSpeakerManagerService() { MOZ_ASSERT(NS_IsMainThread()); @@ -33,9 +33,18 @@ SpeakerManagerServiceChild::GetSpeakerManagerService() // Create new instance, register, return nsRefPtr service = new SpeakerManagerServiceChild(); - NS_ENSURE_TRUE(service, nullptr); gSpeakerManagerServiceChild = service; + + return gSpeakerManagerServiceChild; +} + +// static +SpeakerManagerService* +SpeakerManagerServiceChild::GetSpeakerManagerService() +{ + MOZ_ASSERT(NS_IsMainThread()); + return gSpeakerManagerServiceChild; } diff --git a/dom/speakermanager/SpeakerManagerServiceChild.h b/dom/speakermanager/SpeakerManagerServiceChild.h index 28680696fe00..7cef542aedb9 100644 --- a/dom/speakermanager/SpeakerManagerServiceChild.h +++ b/dom/speakermanager/SpeakerManagerServiceChild.h @@ -19,7 +19,15 @@ namespace dom { class SpeakerManagerServiceChild : public SpeakerManagerService { public: + /* + * Return null or instance which has been created. + */ static SpeakerManagerService* GetSpeakerManagerService(); + /* + * Return SpeakerManagerServiceChild instance. + * If SpeakerManagerServiceChild is not exist, create and return new one. + */ + static SpeakerManagerService* GetOrCreateSpeakerManagerService(); static void Shutdown(); virtual void ForceSpeaker(bool aEnable, bool aVisible) MOZ_OVERRIDE; virtual bool GetSpeakerStatus() MOZ_OVERRIDE; From d69cd6a1ab1bb6bf78d1aa3651d46fd16d43e61f Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Mon, 18 Aug 2014 15:53:00 -0400 Subject: [PATCH 14/19] Bug 1055316 - Fix unix socket connect backoff scheme such that it will actually backoff. r=tzimmermann --- ipc/unixsocket/SocketBase.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ipc/unixsocket/SocketBase.cpp b/ipc/unixsocket/SocketBase.cpp index 46d0de9955a5..9f8bd48d09d2 100644 --- a/ipc/unixsocket/SocketBase.cpp +++ b/ipc/unixsocket/SocketBase.cpp @@ -76,6 +76,7 @@ SocketConsumerBase::NotifyError() mConnectionStatus = SOCKET_DISCONNECTED; mConnectDelayMs = CalculateConnectDelayMs(); + mConnectTimestamp = 0; OnConnectError(); } @@ -86,6 +87,7 @@ SocketConsumerBase::NotifyDisconnect() mConnectionStatus = SOCKET_DISCONNECTED; mConnectDelayMs = CalculateConnectDelayMs(); + mConnectTimestamp = 0; OnDisconnect(); } @@ -96,7 +98,7 @@ SocketConsumerBase::CalculateConnectDelayMs() const uint32_t connectDelayMs = mConnectDelayMs; - if ((PR_IntervalNow()-mConnectTimestamp) > connectDelayMs) { + if (mConnectTimestamp && (PR_IntervalNow()-mConnectTimestamp) > connectDelayMs) { // reset delay if connection has been opened for a while, or... connectDelayMs = 0; } else if (!connectDelayMs) { From c6a4df843d9343d0478eea06ed4def8ecb7478b8 Mon Sep 17 00:00:00 2001 From: "C.J. Ku" Date: Tue, 19 Aug 2014 19:38:00 -0400 Subject: [PATCH 15/19] Bug 1055040 - Send mouse events base on canvas position and enable this test case on all B2G builds. r=ehsan --- layout/generic/test/mochitest.ini | 1 - layout/generic/test/test_bug470212.html | 23 ++++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini index f3d30cd0955d..e125448cd713 100644 --- a/layout/generic/test/mochitest.ini +++ b/layout/generic/test/mochitest.ini @@ -53,7 +53,6 @@ support-files = file_bug449653_1.html file_bug449653_1_ref.html [test_bug460532.html] [test_bug468167.html] [test_bug470212.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(shift mouse select not working in b2g) b2g-desktop(shift mouse select not working in b2g) [test_bug488417.html] skip-if = true # Bug 489560 [test_bug496275.html] diff --git a/layout/generic/test/test_bug470212.html b/layout/generic/test/test_bug470212.html index 42c600348117..1025d89ef590 100644 --- a/layout/generic/test/test_bug470212.html +++ b/layout/generic/test/test_bug470212.html @@ -11,7 +11,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=470212 Mozilla Bug 470212
- +
@@ -20,12 +20,25 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=470212 function doShiftDrag(){ setTimeout(function() { var wu = SpecialPowers.DOMWindowUtils; - wu.sendMouseEvent('mousedown', 0, 0, 0, 1, 4); - wu.sendMouseEvent('mousemove', 60, 10, 0, 0, 4); - wu.sendMouseEvent('mousemove', 70, 250, 0, 0, 4); + var canvas = document.getElementById("dragSource"); + var canvasRect = canvas.getBoundingClientRect(); + + // Drag canvas element starts with a mouse down event, combine with shift + // key, follows by two mouse move events. + + // Press on left-top corner of the canvas element. + wu.sendMouseEvent('mousedown', canvasRect.left, canvasRect.top, 0, 1, 4); + // Move to the center of this cavas element. + wu.sendMouseEvent('mousemove', canvasRect.left + (canvasRect.width / 2), + canvasRect.top + (canvasRect.height / 2), 0, 0, 4); + // move out of cavas's region. + wu.sendMouseEvent('mousemove', canvasRect.left + (canvasRect.width / 2), + canvasRect.bottom + 10, 0, 0, 4); is(window.getSelection().rangeCount, 0, "rangeCount should be 0"); - wu.sendMouseEvent('mouseup', 70, 250, 0, 0, 4); + + wu.sendMouseEvent('mouseup', canvasRect.left + (canvasRect.width / 2), + canvasRect.bottom + 10, 0, 0, 4); SimpleTest.finish(); }, 0); From e6e7f226f971ef8f40f708b5c940fc74a486b768 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 06:08:45 -0700 Subject: [PATCH 16/19] Bumping manifests a=b2g-bump --- b2g/config/flame/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index c20456e16abf..43d9a7bc9ab6 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -122,7 +122,7 @@ - + From 754fbda8ac054666b6451eda3e1f75bd24f74b2a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 06:15:36 -0700 Subject: [PATCH 17/19] Bumping gaia.json for 7 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/07bbb7902390 Author: Ryan VanderMeulen Desc: Merge pull request #23041 from aosmond/fix_record_error_display Bug 1055619 ======== https://hg.mozilla.org/integration/gaia-central/rev/83bd19b9d82b Author: Andrew Osmond Desc: Add brief comment clarifying why we ignore err param ======== https://hg.mozilla.org/integration/gaia-central/rev/ca35d90b391d Author: Andrew Osmond Desc: Fix copy and paste error (and source) for error callback prototype ======== https://hg.mozilla.org/integration/gaia-central/rev/3f2a07a4e861 Author: Andrew Osmond Desc: Make gecko recording errors display a generic error message instead of nothing ======== https://hg.mozilla.org/integration/gaia-central/rev/49fb677abe5b Author: Ryan VanderMeulen Desc: Merge pull request #23047 from eliperelman/bug-1048593 Bug 1048593 - Changing system confirm dialogs to account for software home button ======== https://hg.mozilla.org/integration/gaia-central/rev/01eb2885d83a Author: Eli Perelman Desc: Bug 1048593 - Changing system confirm dialogs to account for software home button ======== https://hg.mozilla.org/integration/gaia-central/rev/a957930ad1d2 Author: Ed Morley Desc: Revert "Bug 1052503 - [Rocketbar] Update loading progress bar r=benfrancis" for B2G debug emulator xpcshell timeouts This reverts commit 3a31d1317cffb14fb0636467ce2dcca15c9b19d3. --- 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 3b1483b79a03..5d96d62f04a8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "a098afe913e391506fd90ec702e2a0b1ee896b9d", + "revision": "07bbb7902390e443e80c79ec10d272ad216f4b1f", "repo_path": "/integration/gaia-central" } From e5ec4cc74af081c315e2667429c32b81947bc7cb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 06:21:50 -0700 Subject: [PATCH 18/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 34cf96ca8aa1..4e449c7ea6f7 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 158d702e5103..186a0b6bf19c 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 1968e2f01ef6..833f860b54be 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 beb146c8ae38..2b8497ea3e71 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 158d702e5103..186a0b6bf19c 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 43d9a7bc9ab6..d1396398346b 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 f6a8c87e178c..ac224f12e456 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 2adbe1ba338e..d1f48708256b 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 0ebd2da18932..97221cae7207 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 d7abb617a92f..3e95fa3ce479 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c76b6c51f7c3a9f5e5f4ae3789de2d2d59426f7e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 20 Aug 2014 07:01:57 -0700 Subject: [PATCH 19/19] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 4e449c7ea6f7..9c18c8af78af 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 186a0b6bf19c..4ef5039b3be2 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 833f860b54be..286508e9a196 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 2b8497ea3e71..864353aa1b44 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 186a0b6bf19c..4ef5039b3be2 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 d1396398346b..37f18a1a8660 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 ac224f12e456..da92de1d5c68 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 97221cae7207..371ba6e75991 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 3e95fa3ce479..f82954d2e16e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -22,7 +22,7 @@ - +