From 441208d7b9eda80e8a3a80d1930ea1d08bcb8e6a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 03:00:18 -0700 Subject: [PATCH 01/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/49ce8ee9e4fa Author: Arnau Desc: Merge pull request #20796 from pacorampas/call-screen-space-name-number-1026341 Bug 1026341 - [Dialer][Call Screen][Flame] Some space, a thin line, not covered by name, number white background r=rik ======== https://hg.mozilla.org/integration/gaia-central/rev/ca9326a529ed Author: Paco Rampas Desc: Bug 1026341 - [Dialer][Call Screen][Flame] Some space, a thin line, not covered by name, number white background --- 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 7e30b6be4532..92657e805db1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "616fb21109ca9af6e0371a6d109dc4e3032ae4be", + "revision": "49ce8ee9e4fac0328e1fd99d68120ffef3ebe813", "repo_path": "/integration/gaia-central" } From dd3bf1b5c880fc52bd2d6be251c60e7bb27ef6ed Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 03:06:33 -0700 Subject: [PATCH 02/50] 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 ee12ce2fa498..a5eddaff0af0 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 72da233294d7..8f0ffd0fc38d 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 4d7a77947198..d00527943be5 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 ee12ce2fa498..a5eddaff0af0 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 2822cc7bb752..50e0b8cda982 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 5a8246021f12..7b1100ab11b6 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 8619b92f34e7..afe9f649e6ab 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 09995c802a10..0b73b8faa103 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 e631498b1644..05a548a1d90e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From bf742138888a9c063a02cee75cafa97b36c27442 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 03:55:23 -0700 Subject: [PATCH 03/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3c6721504d29 Author: Min-Zhong "John" Lu Desc: Merge pull request #21254 from mnjul/1031505_switch_keyboard_caps Bug 1031505 - Switching keyboard layout type when messaging enables capslocks. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/4027f46d45f2 Author: John Lu [:mnjul] Desc: Bug 1031505 - Switching keyboard layout type when messaging enables capslocks --- 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 92657e805db1..4c812f8a9ec6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "49ce8ee9e4fac0328e1fd99d68120ffef3ebe813", + "revision": "3c6721504d29c14a3df786ca4f8fc50dbb631706", "repo_path": "/integration/gaia-central" } From c4532350af4d849482629fd333fb62a188108205 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 04:01:37 -0700 Subject: [PATCH 04/50] 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 a5eddaff0af0..1e7d43ae719c 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 8f0ffd0fc38d..328ac49d740a 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 d00527943be5..574b595f5192 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 a5eddaff0af0..1e7d43ae719c 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 50e0b8cda982..3506af5ff8f5 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 7b1100ab11b6..cbffc1506724 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 afe9f649e6ab..ca31418bfb8d 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 0b73b8faa103..3336905c5d0c 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 05a548a1d90e..17ce41e24a81 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 6e3a3987bcca6c457e7fd6a9ade8b70b7e10d656 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 04:35:26 -0700 Subject: [PATCH 05/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ad85cef857ce Author: Zac Desc: Merge pull request #21256 from zacc/bug_1032707 Bug 1032707 - Target intermittent clock failures on TBPL ======== https://hg.mozilla.org/integration/gaia-central/rev/cbf211f3d5a7 Author: Zac Desc: Bug 1032707 - Target intermittent clock failures on TBPL --- 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 4c812f8a9ec6..50b7eed80acd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "3c6721504d29c14a3df786ca4f8fc50dbb631706", + "revision": "ad85cef857ce4d1fc8f5db5858e725e3916a7eb6", "repo_path": "/integration/gaia-central" } From cbb7e08c98268fe014d59a1d90f0fe674fc2c363 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 04:41:39 -0700 Subject: [PATCH 06/50] 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 1e7d43ae719c..e4af1c4242bf 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 328ac49d740a..f477a8bde58f 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 574b595f5192..304900927a43 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 1e7d43ae719c..e4af1c4242bf 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 3506af5ff8f5..68cd556a96c5 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 cbffc1506724..12f7261213d3 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 ca31418bfb8d..dd165bb0add8 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 3336905c5d0c..9f8e5bd7e644 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 17ce41e24a81..ab9c7ba1802c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 353c236fbfbb6777e2dadbe75cbd05354f2a07bb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 06:30:27 -0700 Subject: [PATCH 07/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/bf10f526c129 Author: Albert Desc: Merge pull request #21065 from acperez/bug-1023338 Bug 1023338 - If 2 APNs with same name are received the first is always selected. ======== https://hg.mozilla.org/integration/gaia-central/rev/e60ab0b0a4d5 Author: Albert Desc: Bug 1023338 - If 2 APNs with same name are received the first is always selected --- 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 50b7eed80acd..3b18bad8607f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ad85cef857ce4d1fc8f5db5858e725e3916a7eb6", + "revision": "bf10f526c129670add7629c78ed5f5bcc95f2802", "repo_path": "/integration/gaia-central" } From 905fd267bc8804ae21eb3a248b233ce8aa356fbd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 06:36:11 -0700 Subject: [PATCH 08/50] 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 e4af1c4242bf..f4e919591ea3 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 f477a8bde58f..432ac3680cad 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 304900927a43..71f464da3cff 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 e4af1c4242bf..f4e919591ea3 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 68cd556a96c5..10ec64f1d66a 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 12f7261213d3..6bcda0237a97 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 dd165bb0add8..b6db89c8e1a8 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 9f8e5bd7e644..b76711a1d905 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 ab9c7ba1802c..6c4ec15840ec 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From aee3fc9fe6cab6fffc5648a2bcd4f72c2fb3b140 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 06:45:30 -0700 Subject: [PATCH 09/50] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ab48cd170930 Author: Gareth Aye Desc: Merge pull request #21277 from gaye/calendar-server-test-calendar-or-user-name Allow username to be different from calendar name in server tests ======== https://hg.mozilla.org/integration/gaia-central/rev/004d82be3f8e Author: gaye Desc: Allow username to be different from calendar name in server tests ======== https://hg.mozilla.org/integration/gaia-central/rev/341fe9c32e28 Author: Gabriele Svelto Desc: Bug 1016885 - Send a notification instead of displaying the dialer when receiving an unsolicited USSD notification r=etienne --- 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 3b18bad8607f..40f6e46e7985 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "bf10f526c129670add7629c78ed5f5bcc95f2802", + "revision": "ab48cd1709309a7c506bd601ea98455e02ea89cc", "repo_path": "/integration/gaia-central" } From 8716a191df0db3ad73707bc1755f531f90f8dbdc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 06:51:18 -0700 Subject: [PATCH 10/50] 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 f4e919591ea3..352be6fe002b 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 432ac3680cad..6f843a5486cc 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 71f464da3cff..1b3fc7fdeabb 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 f4e919591ea3..352be6fe002b 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 10ec64f1d66a..4c9a44632547 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 6bcda0237a97..3e55792206ef 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 b6db89c8e1a8..f60a4904a84b 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 b76711a1d905..9a96913dd200 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 6c4ec15840ec..68db0f79c8bd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 23b49c4e295af79e08866c63c98d227230a08679 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 06:55:26 -0700 Subject: [PATCH 11/50] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/213782152fb9 Author: viorelaioia Desc: Merge pull request #21279 from zacc/bug_1033369 Bug 1033369 - Re-enable test_launch_by_english_name_in_alternate_locale ======== https://hg.mozilla.org/integration/gaia-central/rev/4fe074952842 Author: Zac Desc: Bug 1033369 - Re-enable test_launch_by_english_name_in_alternate_locale ======== https://hg.mozilla.org/integration/gaia-central/rev/685ab6506057 Author: gasolin Desc: Merge pull request #21159 from gasolin/issue-998847-5 Bug 998847 - [Settings] refactor storage.js with AMD pattern, r=arthur ======== https://hg.mozilla.org/integration/gaia-central/rev/a56a330498ee Author: gasolin Desc: Bug 998847 - [Settings] refactor storage.js with AMD pattern - move dialog into root panel - rename id to class - fix marionette test - un-registered observer when leaving the panel - add enabled to observer/unobserve - create separated modules for each menu item - move usb and media item together - fix binding - add py tests - add storage_app_item_test - return directly if the value is the same as this._enabled - pass the element directly when the module only expects one element ======== https://hg.mozilla.org/integration/gaia-central/rev/8aae2d5992c4 Author: Kevin Grandon Desc: Merge pull request #21237 from KevinGrandon/bug_1032933_search_marketplace_icon Bug 1032933 - [Search] Use closest icon size for marketplace results ======== https://hg.mozilla.org/integration/gaia-central/rev/2c02b94e143d Author: Kevin Grandon Desc: Bug 1032933 - [Search] Use closest icon size for marketplace results --- 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 40f6e46e7985..727a74e1d01b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ab48cd1709309a7c506bd601ea98455e02ea89cc", + "revision": "213782152fb9be9c956e7535de76b4f4ed626f04", "repo_path": "/integration/gaia-central" } From 5deff753f886ceda553d73a631ad54769f20ca0e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 07:01:47 -0700 Subject: [PATCH 12/50] 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 352be6fe002b..1392f5fab8d7 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 6f843a5486cc..6d2a44b062db 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 1b3fc7fdeabb..db40229b01da 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 352be6fe002b..1392f5fab8d7 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 4c9a44632547..0f94533a9e2e 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 3e55792206ef..f482f9a9b867 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 f60a4904a84b..b85eb5ba063a 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 9a96913dd200..c06c1c184dd7 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 68db0f79c8bd..0f07c0cae258 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7f78258b0030619ccd94d915afe8f909fa2de908 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 07:10:27 -0700 Subject: [PATCH 13/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5ea76bf5290b Author: Chris Lord Desc: Merge pull request #21267 from Cwiiis/bug1031287-squashed Bug 1031287 - Fix removing transitions from cards in task manager. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/d090f5a8072b Author: Chris Lord Desc: Bug 1031287 - Fix removing transitions from cards in task manager. r=alive --- 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 727a74e1d01b..4999be846728 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "213782152fb9be9c956e7535de76b4f4ed626f04", + "revision": "5ea76bf5290b9a3e8ed7cb9992a22f2b57a8528c", "repo_path": "/integration/gaia-central" } From c498cbdf36b70db991c1753d91cbe447f0121f61 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 07:16:14 -0700 Subject: [PATCH 14/50] 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 1392f5fab8d7..3edf40624a6b 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 6d2a44b062db..651a5cd54d73 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 db40229b01da..735019fbe866 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 1392f5fab8d7..3edf40624a6b 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 0f94533a9e2e..02bbcd75b78d 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 f482f9a9b867..0bb3603b385c 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 b85eb5ba063a..f7da71a38b0e 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 c06c1c184dd7..48d080c35d59 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 0f07c0cae258..7493ea82c291 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From f325cee3b5ad7729505c6c0cf48c8a18d96f529a Mon Sep 17 00:00:00 2001 From: Henry Chang Date: Thu, 19 Dec 2013 11:21:12 +0800 Subject: [PATCH 15/50] Bug 937528 - Initialize port and host for the tcp server accepted socket. r=jduell --- dom/network/interfaces/nsITCPSocketChild.idl | 5 +++- dom/network/interfaces/nsITCPSocketParent.idl | 5 +++- dom/network/src/TCPServerSocketParent.cpp | 18 ++++++++++++++- dom/network/src/TCPSocket.js | 6 +++++ dom/network/src/TCPSocketChild.cpp | 23 ++++++++++++++++++- dom/network/src/TCPSocketChild.h | 4 ++++ dom/network/src/TCPSocketParent.cpp | 20 ++++++++++++++++ .../tests/unit/test_tcpserversocket.js | 12 ++++++++-- netwerk/ipc/NeckoChild.cpp | 4 +++- netwerk/ipc/NeckoChild.h | 3 ++- netwerk/ipc/NeckoParent.cpp | 6 ++++- netwerk/ipc/NeckoParent.h | 3 ++- netwerk/ipc/PNecko.ipdl | 5 +++- 13 files changed, 103 insertions(+), 11 deletions(-) diff --git a/dom/network/interfaces/nsITCPSocketChild.idl b/dom/network/interfaces/nsITCPSocketChild.idl index ba3a88af6a87..4409f172d4f7 100644 --- a/dom/network/interfaces/nsITCPSocketChild.idl +++ b/dom/network/interfaces/nsITCPSocketChild.idl @@ -9,7 +9,7 @@ interface nsIDOMWindow; // Interface to allow the content process socket to reach the IPC bridge. // Implemented in C++ as TCPSocketChild, referenced as _socketBridge in TCPSocket.js -[scriptable, uuid(292ebb3a-beac-4e06-88b0-b5b4e88ebd1c)] +[scriptable, uuid(4277aff0-4c33-11e3-8f96-0800200c9a66)] interface nsITCPSocketChild : nsISupports { // Tell the chrome process to open a corresponding connection with the given parameters @@ -44,4 +44,7 @@ interface nsITCPSocketChild : nsISupports */ [implicit_jscontext] void setSocketAndWindow(in nsITCPSocketInternal socket, in jsval windowVal); + + readonly attribute DOMString host; + readonly attribute unsigned short port; }; diff --git a/dom/network/interfaces/nsITCPSocketParent.idl b/dom/network/interfaces/nsITCPSocketParent.idl index 56e6aebe0059..1f51f4ec0302 100644 --- a/dom/network/interfaces/nsITCPSocketParent.idl +++ b/dom/network/interfaces/nsITCPSocketParent.idl @@ -12,7 +12,7 @@ interface nsITCPSocketIntermediary; // Interface required to allow the TCP socket object (TCPSocket.js) in the // parent process to talk to the parent IPC actor, TCPSocketParent, which // is written in C++. -[scriptable, uuid(868662a4-681c-4b89-9f02-6fe5b7ace265)] +[scriptable, uuid(6f040bf0-6852-11e3-949a-0800200c9a66)] interface nsITCPSocketParent : nsISupports { [implicit_jscontext] void initJS(in jsval intermediary); @@ -55,6 +55,9 @@ interface nsITCPSocketParent : nsISupports // to make sure the bufferedAmount updated on the child will correspond // to the latest call of send(). void sendUpdateBufferedAmount(in uint32_t bufferedAmount, in uint32_t trackingNumber); + + readonly attribute DOMString host; + readonly attribute unsigned short port; }; // Intermediate class to handle sending multiple possible data types diff --git a/dom/network/src/TCPServerSocketParent.cpp b/dom/network/src/TCPServerSocketParent.cpp index 9ad184678ddf..f98271d9ea64 100644 --- a/dom/network/src/TCPServerSocketParent.cpp +++ b/dom/network/src/TCPServerSocketParent.cpp @@ -74,8 +74,24 @@ TCPServerSocketParent::SendCallbackAccept(nsITCPSocketParent *socket) _socket->AddIPDLReference(); + nsresult rv; + + nsString host; + rv = socket->GetHost(host); + if (NS_FAILED(rv)) { + NS_ERROR("Failed to get host from nsITCPSocketParent"); + return NS_ERROR_FAILURE; + } + + uint16_t port; + rv = socket->GetPort(&port); + if (NS_FAILED(rv)) { + NS_ERROR("Failed to get port from nsITCPSocketParent"); + return NS_ERROR_FAILURE; + } + if (mNeckoParent) { - if (mNeckoParent->SendPTCPSocketConstructor(_psocket)) { + if (mNeckoParent->SendPTCPSocketConstructor(_psocket, host, port)) { mozilla::unused << PTCPServerSocketParent::SendCallbackAccept(_psocket); } else { diff --git a/dom/network/src/TCPSocket.js b/dom/network/src/TCPSocket.js index bbb5c72b316a..0344bcc89576 100644 --- a/dom/network/src/TCPSocket.js +++ b/dom/network/src/TCPSocket.js @@ -437,6 +437,10 @@ TCPSocket.prototype = { that._inputStreamPump = new InputStreamPump(that._socketInputStream, -1, -1, 0, 0, false); that._inputStreamPump.asyncRead(that, null); + // Grab host/port from SocketTransport. + that._host = transport.host; + that._port = transport.port; + return that; }, @@ -448,6 +452,8 @@ TCPSocket.prototype = { that._readyState = kOPEN; socketChild.setSocketAndWindow(that, windowObject); that._socketBridge = socketChild; + that._host = socketChild.host; + that._port = socketChild.port; return that; }, diff --git a/dom/network/src/TCPSocketChild.cpp b/dom/network/src/TCPSocketChild.cpp index 1683977e91fc..cf544ea360a6 100644 --- a/dom/network/src/TCPSocketChild.cpp +++ b/dom/network/src/TCPSocketChild.cpp @@ -73,9 +73,16 @@ NS_IMETHODIMP_(MozExternalRefCountType) TCPSocketChild::Release(void) TCPSocketChild::TCPSocketChild() : mWindowObj(nullptr) +, mHost() +, mPort(0) { } +void TCPSocketChild::Init(const nsString& aHost, const uint16_t& aPort) { + mHost = aHost; + mPort = aPort; +} + NS_IMETHODIMP TCPSocketChild::SendOpen(nsITCPSocketInternal* aSocket, const nsAString& aHost, uint16_t aPort, @@ -91,7 +98,7 @@ TCPSocketChild::SendOpen(nsITCPSocketInternal* aSocket, return NS_ERROR_FAILURE; } AddIPDLReference(); - gNeckoChild->SendPTCPSocketConstructor(this); + gNeckoChild->SendPTCPSocketConstructor(this, nsString(aHost), aPort); PTCPSocketChild::SendOpen(nsString(aHost), aPort, aUseSSL, nsString(aBinaryType)); return NS_OK; @@ -246,6 +253,20 @@ TCPSocketChild::SetSocketAndWindow(nsITCPSocketInternal *aSocket, return NS_OK; } +NS_IMETHODIMP +TCPSocketChild::GetHost(nsAString& aHost) +{ + aHost = mHost; + return NS_OK; +} + +NS_IMETHODIMP +TCPSocketChild::GetPort(uint16_t* aPort) +{ + *aPort = mPort; + return NS_OK; +} + bool TCPSocketChild::RecvRequestDelete() { diff --git a/dom/network/src/TCPSocketChild.h b/dom/network/src/TCPSocketChild.h index 29ad583d8e9c..32e3157001a0 100644 --- a/dom/network/src/TCPSocketChild.h +++ b/dom/network/src/TCPSocketChild.h @@ -45,6 +45,8 @@ public: TCPSocketChild(); ~TCPSocketChild(); + void Init(const nsString& aHost, const uint16_t& aPort); + virtual bool RecvCallback(const nsString& aType, const CallbackData& aData, const nsString& aReadyState) MOZ_OVERRIDE; @@ -53,6 +55,8 @@ public: const uint32_t& aTrackingNumber) MOZ_OVERRIDE; private: JSObject* mWindowObj; + nsString mHost; + uint16_t mPort; }; } // namespace dom diff --git a/dom/network/src/TCPSocketParent.cpp b/dom/network/src/TCPSocketParent.cpp index 042e4582714b..8d5e5d72428d 100644 --- a/dom/network/src/TCPSocketParent.cpp +++ b/dom/network/src/TCPSocketParent.cpp @@ -278,6 +278,26 @@ TCPSocketParent::SendUpdateBufferedAmount(uint32_t aBufferedAmount, return NS_OK; } +NS_IMETHODIMP +TCPSocketParent::GetHost(nsAString& aHost) +{ + if (!mSocket) { + NS_ERROR("No internal socket instance mSocket!"); + return NS_ERROR_FAILURE; + } + return mSocket->GetHost(aHost); +} + +NS_IMETHODIMP +TCPSocketParent::GetPort(uint16_t* aPort) +{ + if (!mSocket) { + NS_ERROR("No internal socket instance mSocket!"); + return NS_ERROR_FAILURE; + } + return mSocket->GetPort(aPort); +} + void TCPSocketParent::ActorDestroy(ActorDestroyReason why) { diff --git a/dom/network/tests/unit/test_tcpserversocket.js b/dom/network/tests/unit/test_tcpserversocket.js index bac473b4b5b6..5e5ad3d5c65f 100644 --- a/dom/network/tests/unit/test_tcpserversocket.js +++ b/dom/network/tests/unit/test_tcpserversocket.js @@ -174,6 +174,14 @@ function connectSock() { server = TCPSocket.listen(PORT, options, BACKLOG); server.onconnect = function(socket) { + // Bug 937528 - Accepted client tcp socket (mozTcpSocket) has + // uninitialized host and port. + if (socket.host !== '127.0.0.1') { + do_throw('got unexpected: connected socket host should be 127.0.0.1 but not ' + socket.host); + } else { + do_print('Got expected connected socket host: ' + socket.host); + } + connectedsock = socket; connectedsock.ondata = makeFailureCase('serverdata'); connectedsock.onerror = makeFailureCase('servererror'); @@ -187,7 +195,7 @@ function connectSock() { sock.ondrain = null; sock.ondata = makeFailureCase('data'); sock.onerror = makeFailureCase('error'); - sock.onclose = makeFailureCase('close'); + sock.onclose = makeFailureCase('close'); } /** @@ -197,7 +205,7 @@ function connectSock() { function openSockInClosingServer() { var success = makeSuccessCase('clientnotopen'); var options = { binaryType: 'arraybuffer' }; - + sock = TCPSocket.open( '127.0.0.1', PORT, options); diff --git a/netwerk/ipc/NeckoChild.cpp b/netwerk/ipc/NeckoChild.cpp index d509c5e1e6b7..c7a0e77d5a0c 100644 --- a/netwerk/ipc/NeckoChild.cpp +++ b/netwerk/ipc/NeckoChild.cpp @@ -201,9 +201,11 @@ NeckoChild::DeallocPRtspChannelChild(PRtspChannelChild* child) } PTCPSocketChild* -NeckoChild::AllocPTCPSocketChild() +NeckoChild::AllocPTCPSocketChild(const nsString& host, + const uint16_t& port) { TCPSocketChild* p = new TCPSocketChild(); + p->Init(host, port); p->AddIPDLReference(); return p; } diff --git a/netwerk/ipc/NeckoChild.h b/netwerk/ipc/NeckoChild.h index ea649206a1cc..ba5b7cf2d321 100644 --- a/netwerk/ipc/NeckoChild.h +++ b/netwerk/ipc/NeckoChild.h @@ -43,7 +43,8 @@ protected: AllocPWebSocketChild(const PBrowserOrId&, const SerializedLoadContext&) MOZ_OVERRIDE; virtual bool DeallocPWebSocketChild(PWebSocketChild*) MOZ_OVERRIDE; - virtual PTCPSocketChild* AllocPTCPSocketChild() MOZ_OVERRIDE; + virtual PTCPSocketChild* AllocPTCPSocketChild(const nsString& host, + const uint16_t& port) MOZ_OVERRIDE; virtual bool DeallocPTCPSocketChild(PTCPSocketChild*) MOZ_OVERRIDE; virtual PTCPServerSocketChild* AllocPTCPServerSocketChild(const uint16_t& aLocalPort, diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp index 559e4bbedd85..5fc054b550ba 100644 --- a/netwerk/ipc/NeckoParent.cpp +++ b/netwerk/ipc/NeckoParent.cpp @@ -397,8 +397,12 @@ NeckoParent::DeallocPRtspChannelParent(PRtspChannelParent* actor) } PTCPSocketParent* -NeckoParent::AllocPTCPSocketParent() +NeckoParent::AllocPTCPSocketParent(const nsString& /* host */, + const uint16_t& /* port */) { + // We actually don't need host/port to construct a TCPSocketParent since + // TCPSocketParent will maintain an internal nsIDOMTCPSocket instance which + // can be delegated to get the host/port. TCPSocketParent* p = new TCPSocketParent(); p->AddIPDLReference(); return p; diff --git a/netwerk/ipc/NeckoParent.h b/netwerk/ipc/NeckoParent.h index 3f71ab2365c4..93b6f3317905 100644 --- a/netwerk/ipc/NeckoParent.h +++ b/netwerk/ipc/NeckoParent.h @@ -127,7 +127,8 @@ protected: AllocPWebSocketParent(const PBrowserOrId& browser, const SerializedLoadContext& aSerialized) MOZ_OVERRIDE; virtual bool DeallocPWebSocketParent(PWebSocketParent*) MOZ_OVERRIDE; - virtual PTCPSocketParent* AllocPTCPSocketParent() MOZ_OVERRIDE; + virtual PTCPSocketParent* AllocPTCPSocketParent(const nsString& host, + const uint16_t& port) MOZ_OVERRIDE; virtual PRemoteOpenFileParent* AllocPRemoteOpenFileParent(const SerializedLoadContext& aSerialized, diff --git a/netwerk/ipc/PNecko.ipdl b/netwerk/ipc/PNecko.ipdl index 4c5e5bc0247f..a05358340262 100644 --- a/netwerk/ipc/PNecko.ipdl +++ b/netwerk/ipc/PNecko.ipdl @@ -102,7 +102,10 @@ child: nsString realm, uint64_t callbackId); both: - PTCPSocket(); + // Actually we need PTCPSocket() for parent. But ipdl disallows us having different + // signatures on parent and child. So when constructing the parent side object, we just + // leave host/port unused. + PTCPSocket(nsString host, uint16_t port); }; From 415b181f965380d9142782718f37ed7ca1d9f78b Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Tue, 1 Jul 2014 15:27:08 +0100 Subject: [PATCH 16/50] Bug 1018154 - part 1: replace blocking of security principal inheriting with onpaste handler, r=dao --- browser/base/content/browser.js | 48 ++++++++++++++----------- browser/base/content/urlbarBindings.xml | 43 +++++++++++++++++----- toolkit/modules/Services.jsm | 1 + 3 files changed, 62 insertions(+), 30 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index d9e2d4d85892..7f89532b0338 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -1910,7 +1910,6 @@ function loadURI(uri, referrer, postData, allowThirdPartyFixup) { } function getShortcutOrURIAndPostData(aURL, aCallback) { - let mayInheritPrincipal = false; let postData = null; let shortcutURL = null; let keyword = aURL; @@ -1926,8 +1925,7 @@ function getShortcutOrURIAndPostData(aURL, aCallback) { if (engine) { let submission = engine.getSubmission(param); postData = submission.postData; - aCallback({ postData: submission.postData, url: submission.uri.spec, - mayInheritPrincipal: mayInheritPrincipal }); + aCallback({ postData: submission.postData, url: submission.uri.spec }); return; } @@ -1935,8 +1933,7 @@ function getShortcutOrURIAndPostData(aURL, aCallback) { PlacesUtils.getURLAndPostDataForKeyword(keyword); if (!shortcutURL) { - aCallback({ postData: postData, url: aURL, - mayInheritPrincipal: mayInheritPrincipal }); + aCallback({ postData: postData, url: aURL }); return; } @@ -1968,12 +1965,7 @@ function getShortcutOrURIAndPostData(aURL, aCallback) { postData = getPostDataStream(escapedPostData, param, encodedParam, "application/x-www-form-urlencoded"); - // This URL came from a bookmark, so it's safe to let it inherit the current - // document's principal. - mayInheritPrincipal = true; - - aCallback({ postData: postData, url: shortcutURL, - mayInheritPrincipal: mayInheritPrincipal }); + aCallback({ postData: postData, url: shortcutURL }); } if (matches) { @@ -1996,15 +1988,9 @@ function getShortcutOrURIAndPostData(aURL, aCallback) { // the original URL. postData = null; - aCallback({ postData: postData, url: aURL, - mayInheritPrincipal: mayInheritPrincipal }); + aCallback({ postData: postData, url: aURL }); } else { - // This URL came from a bookmark, so it's safe to let it inherit the current - // document's principal. - mayInheritPrincipal = true; - - aCallback({ postData: postData, url: shortcutURL, - mayInheritPrincipal: mayInheritPrincipal }); + aCallback({ postData: postData, url: shortcutURL }); } } @@ -5144,6 +5130,8 @@ function middleMousePaste(event) { // bar's behavior (stripsurroundingwhitespace) clipboard = clipboard.replace(/\s*\n\s*/g, ""); + clipboard = stripUnsafeProtocolOnPaste(clipboard); + // if it's not the current tab, we don't need to do anything because the // browser doesn't exist. let where = whereToOpenLink(event, true, false); @@ -5171,14 +5159,32 @@ function middleMousePaste(event) { if (where != "current" || lastLocationChange == gBrowser.selectedBrowser.lastLocationChange) { openUILink(data.url, event, - { ignoreButton: true, - disallowInheritPrincipal: !data.mayInheritPrincipal }); + { ignoreButton: true }); } }); event.stopPropagation(); } +function stripUnsafeProtocolOnPaste(pasteData) { + // Don't allow pasting in full URIs which inherit the security context. + const URI_INHERITS_SECURITY_CONTEXT = Ci.nsIProtocolHandler.URI_INHERITS_SECURITY_CONTEXT; + let pastedURI; + pasteData = pasteData.trim(); + do { + if (pastedURI) { + pasteData = pastedURI.path.trim(); + } + try { + pastedURI = makeURI(pasteData); + } catch (ex) { + break; + } + } while (Services.netutil.URIChainHasFlags(pastedURI, URI_INHERITS_SECURITY_CONTEXT)); + + return pasteData; +} + function handleDroppedLink(event, url, name) { let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange; diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml index 9666f7c57256..d96f70e89857 100644 --- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -62,6 +62,7 @@ this._ignoreNextSelect = false; this.inputField.controllers.insertControllerAt(0, this._copyCutController); + this.inputField.addEventListener("paste", this, false); this.inputField.addEventListener("mousedown", this, false); this.inputField.addEventListener("mousemove", this, false); this.inputField.addEventListener("mouseout", this, false); @@ -111,6 +112,7 @@ this._prefs.removeObserver("", this); this._prefs = null; this.inputField.controllers.removeController(this._copyCutController); + this.inputField.removeEventListener("paste", this, false); this.inputField.removeEventListener("mousedown", this, false); this.inputField.removeEventListener("mousemove", this, false); this.inputField.removeEventListener("mouseout", this, false); @@ -263,7 +265,6 @@ return; // Do nothing for right clicks var url = this.value; - var mayInheritPrincipal = false; var postData = null; var action = this._parseActionUrl(url); @@ -286,7 +287,7 @@ } else { this._canonizeURL(aTriggeringEvent, response => { - [url, postData, mayInheritPrincipal] = response; + [url, postData] = response; if (url) { matchLastLocationChange = (lastLocationChange == gBrowser.selectedBrowser.lastLocationChange); @@ -311,12 +312,6 @@ let webnav = Ci.nsIWebNavigation; let flags = webnav.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP | webnav.LOAD_FLAGS_FIXUP_SCHEME_TYPOS; - // Pass LOAD_FLAGS_DISALLOW_INHERIT_OWNER to prevent any loads from - // inheriting the currently loaded document's principal, unless this - // URL is marked as safe to inherit (e.g. came from a bookmark - // keyword). - if (!mayInheritPrincipal) - flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER; gBrowser.loadURIWithFlags(url, flags, null, null, postData); } @@ -427,7 +422,7 @@ } getShortcutOrURIAndPostData(url, data => { - aCallback([data.url, data.postData, data.mayInheritPrincipal]); + aCallback([data.url, data.postData]); }); ]]> @@ -624,6 +619,36 @@ Date: Tue, 1 Jul 2014 14:28:49 +0100 Subject: [PATCH 17/50] Bug 1018154 - part 2: adjust tests now that mayInheritPrincipal has gone the way of the dodo, r=Unfocused --HG-- rename : browser/base/content/test/general/browser_middleMouse_inherit.js => browser/base/content/test/general/browser_middleMouse_noJSPaste.js --- browser/base/content/test/general/browser.ini | 4 +- .../test/general/browser_getshortcutoruri.js | 16 ++--- .../browser_locationBarExternalLoad.js | 65 ------------------- ...it.js => browser_middleMouse_noJSPaste.js} | 6 +- 4 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 browser/base/content/test/general/browser_locationBarExternalLoad.js rename browser/base/content/test/general/{browser_middleMouse_inherit.js => browser_middleMouse_noJSPaste.js} (85%) diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index a2e66fdc9085..f3a87fd9439d 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -309,11 +309,9 @@ skip-if = e10s # Bug ?????? - test directly manipulates content (gBrowser.conten skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bug 969405) [browser_locationBarCommand.js] skip-if = os == "linux" || e10s # Linux: Intermittent failures, bug 917535; e10s: Bug ?????? - Focus issues (There should be no focused element - Got [object XULElement], expected null) -[browser_locationBarExternalLoad.js] -skip-if = e10s # Bug ?????? - URL bar issues ("There should be no focused element - Got [object XULElement], expected null") [browser_menuButtonFitts.js] skip-if = os != "win" || e10s # The Fitts Law menu button is only supported on Windows (bug 969376); # Bug ?????? - URL bar issues ("There should be no focused element - Got [object XULElement], expected null") -[browser_middleMouse_inherit.js] +[browser_middleMouse_noJSPaste.js] skip-if = e10s # Bug 921952 - Content:Click event issues [browser_minimize.js] skip-if = e10s # Bug ?????? - test directly manipulates content (TypeError: gBrowser.docShell is null) diff --git a/browser/base/content/test/general/browser_getshortcutoruri.js b/browser/base/content/test/general/browser_getshortcutoruri.js index dd47b84d4a14..8d64c1a712c4 100644 --- a/browser/base/content/test/general/browser_getshortcutoruri.js +++ b/browser/base/content/test/general/browser_getshortcutoruri.js @@ -11,10 +11,9 @@ function getPostDataString(aIS) { return dataLines[dataLines.length-1]; } -function keywordResult(aURL, aPostData, aIsUnsafe) { +function keywordResult(aURL, aPostData) { this.url = aURL; this.postData = aPostData; - this.isUnsafe = aIsUnsafe; } function keyWordData() {} @@ -53,20 +52,20 @@ var testData = [ new keywordResult("http://bmget-nosearch/", null)], [new searchKeywordData("searchget", "http://searchget/?search={searchTerms}", null, "foo4"), - new keywordResult("http://searchget/?search=foo4", null, true)], + new keywordResult("http://searchget/?search=foo4", null)], [new searchKeywordData("searchpost", "http://searchpost/", "search={searchTerms}", "foo5"), - new keywordResult("http://searchpost/", "search=foo5", true)], + new keywordResult("http://searchpost/", "search=foo5")], [new searchKeywordData("searchpostget", "http://searchpostget/?search1={searchTerms}", "search2={searchTerms}", "foo6"), - new keywordResult("http://searchpostget/?search1=foo6", "search2=foo6", true)], + new keywordResult("http://searchpostget/?search1=foo6", "search2=foo6")], // Bookmark keywords that don't take parameters should not be activated if a // parameter is passed (bug 420328). [new bmKeywordData("bmget-noparam", "http://bmget-noparam/", null, "foo7"), - new keywordResult(null, null, true)], + new keywordResult(null, null)], [new bmKeywordData("bmpost-noparam", "http://bmpost-noparam/", "not_a=param", "foo8"), - new keywordResult(null, null, true)], + new keywordResult(null, null)], // Test escaping (%s = escaped, %S = raw) // UTF-8 default @@ -88,7 +87,7 @@ var testData = [ // getShortcutOrURIAndPostData for non-keywords (setupKeywords only adds keywords for // bmKeywordData objects) [{keyword: "http://gavinsharp.com"}, - new keywordResult(null, null, true)] + new keywordResult(null, null)] ]; function test() { @@ -109,7 +108,6 @@ function test() { let expected = result.url || query; is(returnedData.url, expected, "got correct URL for " + data.keyword); is(getPostDataString(returnedData.postData), result.postData, "got correct postData for " + data.keyword); - is(returnedData.mayInheritPrincipal, !result.isUnsafe, "got correct mayInheritPrincipal for " + data.keyword); } cleanupKeywords(); }).then(finish); diff --git a/browser/base/content/test/general/browser_locationBarExternalLoad.js b/browser/base/content/test/general/browser_locationBarExternalLoad.js deleted file mode 100644 index 2bc88a989e32..000000000000 --- a/browser/base/content/test/general/browser_locationBarExternalLoad.js +++ /dev/null @@ -1,65 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -function test() { - waitForExplicitFinish(); - - nextTest(); -} - -let urls = [ - "javascript:'foopy';", - "data:text/html,hi" -]; - -function urlEnter(url) { - gURLBar.value = url; - gURLBar.focus(); - EventUtils.synthesizeKey("VK_RETURN", {}); -} - -function urlClick(url) { - gURLBar.value = url; - gURLBar.focus(); - let goButton = document.getElementById("urlbar-go-button"); - EventUtils.synthesizeMouseAtCenter(goButton, {}); -} - -function nextTest() { - let url = urls.shift(); - if (url) { - testURL(url, urlEnter, function () { - testURL(url, urlClick, nextTest); - }); - } - else - finish(); -} - -function testURL(url, loadFunc, endFunc) { - let tab = gBrowser.selectedTab = gBrowser.addTab(); - registerCleanupFunction(function () { - gBrowser.removeTab(tab); - }); - addPageShowListener(function () { - let pagePrincipal = gBrowser.contentPrincipal; - loadFunc(url); - - addPageShowListener(function () { - let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager); - is(fm.focusedElement, null, "should be no focused element"); - is(fm.focusedWindow, gBrowser.contentWindow, "content window should be focused"); - - ok(!gBrowser.contentPrincipal.equals(pagePrincipal), - "load of " + url + " by " + loadFunc.name + " should produce a page with a different principal"); - endFunc(); - }); - }); -} - -function addPageShowListener(func) { - gBrowser.selectedBrowser.addEventListener("pageshow", function loadListener() { - gBrowser.selectedBrowser.removeEventListener("pageshow", loadListener, false); - func(); - }); -} diff --git a/browser/base/content/test/general/browser_middleMouse_inherit.js b/browser/base/content/test/general/browser_middleMouse_noJSPaste.js similarity index 85% rename from browser/base/content/test/general/browser_middleMouse_inherit.js rename to browser/base/content/test/general/browser_middleMouse_noJSPaste.js index 891ea2ed0918..dc8755d7352e 100644 --- a/browser/base/content/test/general/browser_middleMouse_inherit.js +++ b/browser/base/content/test/general/browser_middleMouse_noJSPaste.js @@ -20,7 +20,7 @@ function test() { let pagePrincipal = gBrowser.contentPrincipal; // copy javascript URI to the clipboard - let url = "javascript:1+1"; + let url = "javascript:http://www.example.com/"; waitForClipboard(url, function() { Components.classes["@mozilla.org/widget/clipboardhelper;1"] @@ -39,9 +39,7 @@ function test() { ); addPageShowListener(function () { - is(gBrowser.currentURI.spec, url, "url loaded by middle click"); - ok(!gBrowser.contentPrincipal.equals(pagePrincipal), - "middle click load of " + url + " should produce a page with a different principal"); + is(gBrowser.currentURI.spec, url.replace(/^javascript:/, ""), "url loaded by middle click doesn't include JS"); finish(); }); }); From fb9b19971c20ef2450ccf5e94e14470c2ecbbac0 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Tue, 1 Jul 2014 15:04:11 +0100 Subject: [PATCH 18/50] Bug 1018154 - part 3: add test for URL bar javascript URI pastes, r=Unfocused --- browser/base/content/test/general/browser.ini | 1 + ...er_removeUnsafeProtocolsFromURLBarPaste.js | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index f3a87fd9439d..23adf7b780d0 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -345,6 +345,7 @@ skip-if = e10s # Bug ?????? - timeout after logging "Error: Channel closing: too [browser_relatedTabs.js] [browser_removeTabsToTheEnd.js] skip-if = e10s # Bug 921905 - pinTab/unpinTab fail in e10s +[browser_removeUnsafeProtocolsFromURLBarPaste.js] [browser_sanitize-download-history.js] skip-if = true # bug 432425 [browser_sanitize-passwordDisabledHosts.js] diff --git a/browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js b/browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js new file mode 100644 index 000000000000..c485ff94966d --- /dev/null +++ b/browser/base/content/test/general/browser_removeUnsafeProtocolsFromURLBarPaste.js @@ -0,0 +1,49 @@ +function test() { + waitForExplicitFinish(); + testNext(); +} + +let pairs = [ + ["javascript:", ""], + ["javascript:1+1", "1+1"], + ["javascript:document.domain", "document.domain"], + ["data:text/html,hi", "text/html,hi"], + // Nested things get confusing because some things don't parse as URIs: + ["javascript:javascript:alert('hi!')", "alert('hi!')"], + ["data:data:text/html,hi", "text/html,hi"], + ["javascript:data:javascript:alert('hi!')", "data:javascript:alert('hi!')"], + ["javascript:data:text/html,javascript:alert('hi!')", "text/html,javascript:alert('hi!')"], + ["data:data:text/html,javascript:alert('hi!')", "text/html,javascript:alert('hi!')"], +]; + +let clipboardHelper = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper); + +function paste(input, cb) { + waitForClipboard(input, function() { + clipboardHelper.copyString(input); + }, function() { + document.commandDispatcher.getControllerForCommand("cmd_paste").doCommand("cmd_paste"); + cb(); + }, function() { + ok(false, "Failed to copy string '" + input + "' to clipboard"); + cb(); + }); +} + +function testNext() { + gURLBar.value = ''; + if (!pairs.length) { + finish(); + return; + } + + let [inputValue, expectedURL] = pairs.shift(); + + gURLBar.focus(); + paste(inputValue, function() { + is(gURLBar.value, expectedURL, "entering '" + inputValue + "' strips relevant bits."); + + setTimeout(testNext, 0); + }); +} + From ed2f4a79310ccb3dc2a8429f528bd7dc99ed30ef Mon Sep 17 00:00:00 2001 From: Patrick Brosset Date: Wed, 2 Jul 2014 04:39:00 -0400 Subject: [PATCH 19/50] Bug 1026395 - Avoid unhandled rejected promise in browser_ruleview_edit-property-increments.js. r=jwalker --- browser/devtools/shared/autocomplete-popup.js | 3 +- browser/devtools/shared/widgets/Tooltip.js | 4 +- browser/devtools/styleinspector/rule-view.js | 15 ++++-- ...owser_ruleview_edit-property-increments.js | 46 ++++++++++--------- toolkit/devtools/server/actors/inspector.js | 4 ++ 5 files changed, 43 insertions(+), 29 deletions(-) diff --git a/browser/devtools/shared/autocomplete-popup.js b/browser/devtools/shared/autocomplete-popup.js index 1eb1a30aaec8..fd2252dd4e36 100644 --- a/browser/devtools/shared/autocomplete-popup.js +++ b/browser/devtools/shared/autocomplete-popup.js @@ -155,7 +155,8 @@ AutocompletePopup.prototype = { * Check if the autocomplete popup is open. */ get isOpen() { - return this._panel.state == "open" || this._panel.state == "showing"; + return this._panel && + (this._panel.state == "open" || this._panel.state == "showing"); }, /** diff --git a/browser/devtools/shared/widgets/Tooltip.js b/browser/devtools/shared/widgets/Tooltip.js index 2d1ea7095937..8a2a77d2d5bc 100644 --- a/browser/devtools/shared/widgets/Tooltip.js +++ b/browser/devtools/shared/widgets/Tooltip.js @@ -257,7 +257,9 @@ Tooltip.prototype = { }, isShown: function() { - return this.panel.state !== "closed" && this.panel.state !== "hiding"; + return this.panel && + this.panel.state !== "closed" && + this.panel.state !== "hiding"; }, setSize: function(width, height) { diff --git a/browser/devtools/styleinspector/rule-view.js b/browser/devtools/styleinspector/rule-view.js index 153fb5d88a62..2f3e6eb6c146 100644 --- a/browser/devtools/styleinspector/rule-view.js +++ b/browser/devtools/styleinspector/rule-view.js @@ -167,7 +167,7 @@ ElementStyle.prototype = { dummyElement.parentNode.removeChild(dummyElement); } this.dummyElementPromise = null; - }); + }, console.error); }, /** @@ -511,7 +511,7 @@ Rule.prototype = { this._originalSourceStrings = sourceStrings; return sourceStrings; - }); + }, console.error); }, /** @@ -1395,6 +1395,7 @@ CssRuleView.prototype = { }, destroy: function() { + this.isDestroyed = true; this.clear(); gDummyPromise = null; @@ -1405,9 +1406,9 @@ CssRuleView.prototype = { this._prefObserver.destroy(); this.element.removeEventListener("copy", this._onCopy); - delete this._onCopy; + this._onCopy = null; - delete this._outputParser; + this._outputParser = null; // Remove context menu if (this._contextmenu) { @@ -1858,7 +1859,7 @@ RuleEditor.prototype = { this.rule.getOriginalSourceStrings().then((strings) => { sourceLabel.setAttribute("value", strings.short); sourceLabel.setAttribute("tooltiptext", strings.full); - }) + }, console.error); } }, @@ -2319,6 +2320,10 @@ TextPropertyEditor.prototype = { * Populate the span based on changes to the TextProperty. */ update: function() { + if (this.ruleEditor.ruleView.isDestroyed) { + return; + } + if (this.prop.enabled) { this.enable.style.removeProperty("visibility"); this.enable.setAttribute("checked", ""); diff --git a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js b/browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js index 19798fb7bcbd..f183702a4cfa 100644 --- a/browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js +++ b/browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js @@ -23,18 +23,22 @@ let test = asyncTest(function*() { }); function createDocument() { - content.document.body.innerHTML = '
'+ - '
'; + content.document.body.innerHTML = '' + + '' + + '
'; } function* testMarginIncrements(view) { info("Testing keyboard increments on the margin property"); - let idRuleEditor = getRuleViewRuleEditor(view, 0); + let idRuleEditor = getRuleViewRuleEditor(view, 1); let marginPropEditor = idRuleEditor.rule.textProps[0].editor; yield runIncrementTest(marginPropEditor, view, { @@ -52,7 +56,7 @@ function* testMarginIncrements(view) { function* testVariousUnitIncrements(view) { info("Testing keyboard increments on values with various units"); - let idRuleEditor = getRuleViewRuleEditor(view, 0); + let idRuleEditor = getRuleViewRuleEditor(view, 1); let paddingPropEditor = idRuleEditor.rule.textProps[1].editor; yield runIncrementTest(paddingPropEditor, view, { @@ -71,7 +75,7 @@ function* testVariousUnitIncrements(view) { function* testHexIncrements(view) { info("Testing keyboard increments with hex colors"); - let idRuleEditor = getRuleViewRuleEditor(view, 0); + let idRuleEditor = getRuleViewRuleEditor(view, 1); let hexColorPropEditor = idRuleEditor.rule.textProps[2].editor; yield runIncrementTest(hexColorPropEditor, view, { @@ -87,7 +91,7 @@ function* testHexIncrements(view) { function* testRgbIncrements(view) { info("Testing keyboard increments with rgb colors"); - let idRuleEditor = getRuleViewRuleEditor(view, 0); + let idRuleEditor = getRuleViewRuleEditor(view, 1); let rgbColorPropEditor = idRuleEditor.rule.textProps[3].editor; yield runIncrementTest(rgbColorPropEditor, view, { @@ -103,7 +107,7 @@ function* testRgbIncrements(view) { function* testShorthandIncrements(view) { info("Testing keyboard increments within shorthand values"); - let idRuleEditor = getRuleViewRuleEditor(view, 0); + let idRuleEditor = getRuleViewRuleEditor(view, 1); let paddingPropEditor = idRuleEditor.rule.textProps[1].editor; yield runIncrementTest(paddingPropEditor, view, { @@ -119,7 +123,7 @@ function* testShorthandIncrements(view) { function* testOddCases(view) { info("Testing some more odd cases"); - let idRuleEditor = getRuleViewRuleEditor(view, 0); + let idRuleEditor = getRuleViewRuleEditor(view, 1); let marginPropEditor = idRuleEditor.rule.textProps[0].editor; yield runIncrementTest(marginPropEditor, view, { @@ -144,14 +148,11 @@ function* runIncrementTest(propertyEditor, view, tests) { let editor = yield focusEditableField(propertyEditor.valueSpan); for(let test in tests) { - yield testIncrement(editor, tests[test], view); + yield testIncrement(editor, tests[test], view, propertyEditor); } - - // Once properties have been set, wait for the inspector to update - yield view.inspector.once("inspector-updated"); } -function* testIncrement(editor, options, view) { +function* testIncrement(editor, options, view, {ruleEditor}) { editor.input.value = options.start; let input = editor.input; @@ -163,14 +164,15 @@ function* testIncrement(editor, options, view) { is(input.value, options.start, "Value initialized at " + options.start); + let onModifications = ruleEditor.rule._applyingModifications; let onKeyUp = once(input, "keyup"); - let key; key = options.down ? "VK_DOWN" : "VK_UP"; key = options.pageDown ? "VK_PAGE_DOWN" : options.pageUp ? "VK_PAGE_UP" : key; - EventUtils.synthesizeKey(key, {altKey: options.alt, shiftKey: options.shift}, view.doc.defaultView); - + EventUtils.synthesizeKey(key, {altKey: options.alt, shiftKey: options.shift}, + view.doc.defaultView); yield onKeyUp; - input = editor.input; - is(input.value, options.end, "Value changed to " + options.end); + yield onModifications; + + is(editor.input.value, options.end, "Value changed to " + options.end); } diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js index 6b50a1e3a47b..41d6e387976f 100644 --- a/toolkit/devtools/server/actors/inspector.js +++ b/toolkit/devtools/server/actors/inspector.js @@ -2776,6 +2776,10 @@ function nodeDocument(node) { * See TreeWalker documentation for explanations of the methods. */ function DocumentWalker(aNode, aRootWin, aShow, aFilter, aExpandEntityReferences) { + if (!aRootWin.location) { + throw new Error("Got an invalid root window in DocumentWalker"); + } + let doc = nodeDocument(aNode); this.layoutHelpers = new LayoutHelpers(aRootWin); this.walker = doc.createTreeWalker(doc, From 540a9eba9533ef29deebac12ad2a81e017c19c9c Mon Sep 17 00:00:00 2001 From: Brian Grinstead Date: Mon, 30 Jun 2014 06:10:00 -0400 Subject: [PATCH 20/50] Bug 1028235 - Remove additional vertical scrollbar in computed view. r=pbrosset --- browser/themes/shared/devtools/computedview.css | 3 ++- browser/themes/shared/devtools/toolbars.inc.css | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/browser/themes/shared/devtools/computedview.css b/browser/themes/shared/devtools/computedview.css index cbaec23a9dfd..471a7bdfd67b 100644 --- a/browser/themes/shared/devtools/computedview.css +++ b/browser/themes/shared/devtools/computedview.css @@ -147,8 +147,9 @@ body { margin: 0 5px; } -.devtools-toolbar { +#root .devtools-toolbar { width: 100%; + border-bottom-width: 0; } .link { diff --git a/browser/themes/shared/devtools/toolbars.inc.css b/browser/themes/shared/devtools/toolbars.inc.css index 09d44037cb99..1496f56e0b43 100644 --- a/browser/themes/shared/devtools/toolbars.inc.css +++ b/browser/themes/shared/devtools/toolbars.inc.css @@ -14,8 +14,9 @@ .devtools-sidebar-tabs > tabs { -moz-appearance: none; padding: 0; + border-width: 0; border-bottom-width: 1px; - border-bottom-style: solid; + border-style: solid; height: 24px; line-height: 24px; box-sizing: border-box; @@ -33,6 +34,9 @@ margin: 0; padding: 0; } +.devtools-toolbar checkbox .checkbox-label-box { + border: none !important; /* overrides .checkbox-label-box from checkbox.css */ +} .devtools-toolbar checkbox .checkbox-label-box .checkbox-label { margin: 0 6px !important; /* overrides .checkbox-label from checkbox.css */ padding: 0; From 4c8f4fab919d6d8e88771e7d334d1430f20f6fb8 Mon Sep 17 00:00:00 2001 From: Changbin Park Date: Tue, 1 Jul 2014 16:09:20 -0700 Subject: [PATCH 21/50] Bug 1029983 - H.264 codec is working on B2G ignoring preference 'media.peerconnection.video.h264_enabled'. r=ehugg --- .../signaling/src/media/VcmSIPCCBinding.cpp | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp index 9a343ce9e5a1..fb6dbee8055b 100644 --- a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp +++ b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp @@ -34,6 +34,7 @@ #ifdef MOZILLA_INTERNAL_API #include "nsIPrincipal.h" #include "nsIDocument.h" +#include "mozilla/Preferences.h" #endif #include @@ -257,16 +258,22 @@ int VcmSIPCCBinding::getVideoCodecsHw() // Note that currently, OMXCodecReservation needs to be held by an sp<> because it puts // 'this' into an sp to talk to the resource reservation code #ifdef MOZ_WEBRTC_OMX - android::sp encode = new android::OMXCodecReservation(true); - android::sp decode = new android::OMXCodecReservation(false); +#ifdef MOZILLA_INTERNAL_API + if (Preferences::GetBool("media.peerconnection.video.h264_enabled")) { +#endif + android::sp encode = new android::OMXCodecReservation(true); + android::sp decode = new android::OMXCodecReservation(false); - // Currently we just check if they're available right now, which will fail if we're - // trying to call ourself, for example. It will work for most real-world cases, like - // if we try to add a person to a 2-way call to make a 3-way mesh call - if (encode->ReserveOMXCodec() && decode->ReserveOMXCodec()) { - CSFLogDebug( logTag, "%s: H264 hardware codec available", __FUNCTION__); - return VCM_CODEC_RESOURCE_H264; - } + // Currently we just check if they're available right now, which will fail if we're + // trying to call ourself, for example. It will work for most real-world cases, like + // if we try to add a person to a 2-way call to make a 3-way mesh call + if (encode->ReserveOMXCodec() && decode->ReserveOMXCodec()) { + CSFLogDebug( logTag, "%s: H264 hardware codec available", __FUNCTION__); + return VCM_CODEC_RESOURCE_H264; + } +#if defined( MOZILLA_INTERNAL_API) + } +#endif #endif return 0; From 8dbc759b37cbb62ddf9bbd4b4a6c7b7a501452e8 Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Wed, 2 Jul 2014 03:47:00 -0400 Subject: [PATCH 22/50] Bug 1031239 - Part 1: Refactoring. r=hsinyi --- dom/telephony/gonk/TelephonyService.js | 71 +++++++++++++------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/dom/telephony/gonk/TelephonyService.js b/dom/telephony/gonk/TelephonyService.js index 56841f1e0147..7d9460dbe8d1 100644 --- a/dom/telephony/gonk/TelephonyService.js +++ b/dom/telephony/gonk/TelephonyService.js @@ -374,60 +374,61 @@ TelephonyService.prototype = { aListener.enumerateCallStateComplete(); }, + _hasCallsOnOtherClient: function(aClientId) { + for (let cid = 0; cid < this._numClients; ++cid) { + if (cid === aClientId) { + continue; + } + if (Object.keys(this._currentCalls[cid]).length !== 0) { + return true; + } + } + return false; + }, + + // All calls in the conference is regarded as one conference call. + _numCallsOnLine: function(aClientId) { + let numCalls = 0; + let hasConference = false; + + for (let cid in this._currentCalls[aClientId]) { + let call = this._currentCalls[aClientId][cid]; + if (call.isConference) { + hasConference = true; + } else { + numCalls++; + } + } + + return hasConference ? numCalls + 1 : numCalls; + }, + isDialing: false, dial: function(aClientId, aNumber, aIsEmergency, aTelephonyCallback) { if (DEBUG) debug("Dialing " + (aIsEmergency ? "emergency " : "") + aNumber); if (this.isDialing) { - if (DEBUG) debug("Already has a dialing call. Drop."); + if (DEBUG) debug("Error: Already has a dialing call."); aTelephonyCallback.notifyDialError(DIAL_ERROR_INVALID_STATE_ERROR); return; } - function hasCallsOnOtherClient(aClientId) { - for (let cid = 0; cid < this._numClients; ++cid) { - if (cid === aClientId) { - continue; - } - if (Object.keys(this._currentCalls[cid]).length !== 0) { - return true; - } - } - return false; - } - // For DSDS, if there is aleady a call on SIM 'aClientId', we cannot place // any new call on other SIM. - if (hasCallsOnOtherClient.call(this, aClientId)) { - if (DEBUG) debug("Already has a call on other sim. Drop."); + if (this._hasCallsOnOtherClient(aClientId)) { + if (DEBUG) debug("Error: Already has a call on other sim."); aTelephonyCallback.notifyDialError(DIAL_ERROR_OTHER_CONNECTION_IN_USE); return; } - // All calls in the conference is regarded as one conference call. - function numCallsOnLine(aClientId) { - let numCalls = 0; - let hasConference = false; - - for (let cid in this._currentCalls[aClientId]) { - let call = this._currentCalls[aClientId][cid]; - if (call.isConference) { - hasConference = true; - } else { - numCalls++; - } - } - - return hasConference ? numCalls + 1 : numCalls; - } - - if (numCallsOnLine.call(this, aClientId) >= 2) { - if (DEBUG) debug("Has more than 2 calls on line. Drop."); + // We can only have at most two calls on the same line (client). + if (this._numCallsOnLine(aClientId) >= 2) { + if (DEBUG) debug("Error: Has more than 2 calls on line."); aTelephonyCallback.notifyDialError(DIAL_ERROR_INVALID_STATE_ERROR); return; } - // we don't try to be too clever here, as the phone is probably in the + // We don't try to be too clever here, as the phone is probably in the // locked state. Let's just check if it's a number without normalizing if (!aIsEmergency) { aNumber = gPhoneNumberUtils.normalize(aNumber); From 0ec9c34bf073082b4d89d193cce0166ec7893a7f Mon Sep 17 00:00:00 2001 From: "Szu-Yu Chen [:aknow]" Date: Wed, 2 Jul 2014 03:47:00 -0400 Subject: [PATCH 23/50] Bug 1031239 - Part 2: Select clientId for emergency call. r=hsinyi --- dom/system/gonk/RadioInterfaceLayer.js | 9 +++++++++ dom/system/gonk/nsIRadioInterfaceLayer.idl | 9 ++++++++- dom/telephony/gonk/TelephonyService.js | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index 8b98a780f0fb..d51fea6e29b2 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -1576,6 +1576,15 @@ RadioInterfaceLayer.prototype = { return this.radioInterfaces[clientId]; }, + getClientIdForEmergencyCall: function() { + for (let cid = 0; cid < this.numRadioInterfaces; ++cid) { + if (gRadioEnabledController._isRadioAbleToEnableAtClient(cid)) { + return cid; + } + } + return -1; + }, + setMicrophoneMuted: function(muted) { for (let clientId = 0; clientId < this.numRadioInterfaces; clientId++) { let radioInterface = this.radioInterfaces[clientId]; diff --git a/dom/system/gonk/nsIRadioInterfaceLayer.idl b/dom/system/gonk/nsIRadioInterfaceLayer.idl index e247607de0b3..cb1be0e45862 100644 --- a/dom/system/gonk/nsIRadioInterfaceLayer.idl +++ b/dom/system/gonk/nsIRadioInterfaceLayer.idl @@ -93,12 +93,19 @@ interface nsIRadioInterface : nsISupports void getNeighboringCellIds(in nsINeighboringCellIdsCallback callback); }; -[scriptable, uuid(d035c32e-b491-11e3-9f9d-c716fab88bd6)] +[scriptable, uuid(78b65e8c-68e7-4510-9a05-65bba12b283e)] interface nsIRadioInterfaceLayer : nsISupports { readonly attribute unsigned long numRadioInterfaces; nsIRadioInterface getRadioInterface(in unsigned long clientId); + /** + * Select a proper client for dialing emergency call. + * + * @return clientId or -1 if none of the clients are avaialble. + */ + unsigned long getClientIdForEmergencyCall(); + void setMicrophoneMuted(in boolean muted); }; diff --git a/dom/telephony/gonk/TelephonyService.js b/dom/telephony/gonk/TelephonyService.js index 7d9460dbe8d1..18a84015824e 100644 --- a/dom/telephony/gonk/TelephonyService.js +++ b/dom/telephony/gonk/TelephonyService.js @@ -413,6 +413,16 @@ TelephonyService.prototype = { return; } + // Select a proper clientId for dialEmergency. + if (aIsEmergency) { + aClientId = gRadioInterfaceLayer.getClientIdForEmergencyCall() ; + if (aClientId === -1) { + if (DEBUG) debug("Error: No client is avaialble for emergency call."); + aTelephonyCallback.notifyDialError(DIAL_ERROR_INVALID_STATE_ERROR); + return; + } + } + // For DSDS, if there is aleady a call on SIM 'aClientId', we cannot place // any new call on other SIM. if (this._hasCallsOnOtherClient(aClientId)) { From 74e936113ac64afa34aa4547ab9b6ecab10484d0 Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Wed, 2 Jul 2014 15:37:30 +0200 Subject: [PATCH 24/50] Bug 1032853 - TPS infinitely loops through the same phase of a test. r=ahal a=testonly DONTBUILD --- testing/tps/tps/firefoxrunner.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --HG-- extra : rebase_source : 7785bb543c0d44ce6dd3380c8ce1db3bff88cdad --- testing/tps/tps/firefoxrunner.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testing/tps/tps/firefoxrunner.py b/testing/tps/tps/firefoxrunner.py index 27369f9e1972..3b7c143d89f1 100644 --- a/testing/tps/tps/firefoxrunner.py +++ b/testing/tps/tps/firefoxrunner.py @@ -25,7 +25,6 @@ class TPSFirefoxRunner(object): self.url = None self.binary = binary - self.runner = None self.installdir = None def __del__(self): @@ -78,8 +77,8 @@ class TPSFirefoxRunner(object): if self.binary is None and self.url: self.binary = self.download_build() - if self.runner is None: - self.runner = FirefoxRunner(profile=self.profile, binary=self.binary, env=env, cmdargs=args) + runner = FirefoxRunner(profile=self.profile, binary=self.binary, + env=env, cmdargs=args) - self.runner.start(timeout=timeout) - return self.runner.wait() + runner.start(timeout=timeout) + return runner.wait() From 869478490ada4aa36db4fd5f1bcbdea8cd793243 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Wed, 2 Jul 2014 10:27:25 -0400 Subject: [PATCH 25/50] bug 1033013 - disable testMasterPassword, follow up to remove skip-if as well r=gbrown --- mobile/android/base/tests/robocop.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/base/tests/robocop.ini b/mobile/android/base/tests/robocop.ini index 9311c5f4292a..53ed4321817f 100644 --- a/mobile/android/base/tests/robocop.ini +++ b/mobile/android/base/tests/robocop.ini @@ -59,7 +59,7 @@ skip-if = android_version == "10" || processor == "x86" # [testMasterPassword] disabled for being finicky, see bug 1033013 # disabled on 2.3; bug 979603 # disabled on 4.0; bug 1006242 -skip-if = android_version == "10" || android_version == "15" +# skip-if = android_version == "10" || android_version == "15" [testNewTab] # disabled on 2.3; bug 995696 skip-if = android_version == "10" From f3f4eadda97beec33d8ff506856f78b952bfae08 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 07:43:30 -0700 Subject: [PATCH 26/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/eedabf36ee1f Author: Arnau Desc: Merge pull request #18330 from rnowm/996441 Bug 996441 - [FTE] Apply progress step [BB] to Fx Accounts r=fcampo ======== https://hg.mozilla.org/integration/gaia-central/rev/611a0a511a74 Author: rnowm Desc: Bug 996441 - [FTE] Apply progress step [BB] to Fx Accounts --- 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 4999be846728..5d2bd47bb8e2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "5ea76bf5290b9a3e8ed7cb9992a22f2b57a8528c", + "revision": "eedabf36ee1f6e075523e94e12e3fc6aab9bfc75", "repo_path": "/integration/gaia-central" } From 8fec38e9f902dced4017e86a24104639fd490210 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 07:43:41 -0700 Subject: [PATCH 27/50] 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 3edf40624a6b..ca04cf90efc9 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 651a5cd54d73..4adbc7b12ffd 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 735019fbe866..e61119ddda65 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 3edf40624a6b..ca04cf90efc9 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 02bbcd75b78d..d1cfd368995b 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 0bb3603b385c..8e95c80b25ca 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 f7da71a38b0e..b9ccaa03e3e4 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 48d080c35d59..302c6eab0fc3 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 7493ea82c291..23c921d02838 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From adf66df4da326a757fad409fc522b4c11947e03f Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Wed, 2 Jul 2014 22:59:46 +0800 Subject: [PATCH 28/50] Bug 1033209 - Lazily initialize gps callbacks, r=kanru --- .../gonk/GonkGPSGeolocationProvider.cpp | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp index 351b28ea7ee6..3151608fc8b5 100644 --- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp +++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp @@ -61,34 +61,11 @@ NS_IMPL_ISUPPORTS(GonkGPSGeolocationProvider, nsISettingsServiceCallback) /* static */ GonkGPSGeolocationProvider* GonkGPSGeolocationProvider::sSingleton = nullptr; -GpsCallbacks GonkGPSGeolocationProvider::mCallbacks = { - sizeof(GpsCallbacks), - LocationCallback, - StatusCallback, - SvStatusCallback, - NmeaCallback, - SetCapabilitiesCallback, - AcquireWakelockCallback, - ReleaseWakelockCallback, - CreateThreadCallback, -#ifdef GPS_CAPABILITY_ON_DEMAND_TIME - RequestUtcTimeCallback, -#endif -}; +GpsCallbacks GonkGPSGeolocationProvider::mCallbacks; #ifdef MOZ_B2G_RIL -AGpsCallbacks -GonkGPSGeolocationProvider::mAGPSCallbacks = { - AGPSStatusCallback, - CreateThreadCallback, -}; - -AGpsRilCallbacks -GonkGPSGeolocationProvider::mAGPSRILCallbacks = { - AGPSRILSetIDCallback, - AGPSRILRefLocCallback, - CreateThreadCallback, -}; +AGpsCallbacks GonkGPSGeolocationProvider::mAGPSCallbacks; +AGpsRilCallbacks GonkGPSGeolocationProvider::mAGPSRILCallbacks; #endif // MOZ_B2G_RIL void @@ -564,6 +541,31 @@ GonkGPSGeolocationProvider::Init() return; } + if (!mCallbacks.size) { + mCallbacks.size = sizeof(GpsCallbacks); + mCallbacks.location_cb = LocationCallback; + mCallbacks.status_cb = StatusCallback; + mCallbacks.sv_status_cb = SvStatusCallback; + mCallbacks.nmea_cb = NmeaCallback; + mCallbacks.set_capabilities_cb = SetCapabilitiesCallback; + mCallbacks.acquire_wakelock_cb = AcquireWakelockCallback; + mCallbacks.release_wakelock_cb = ReleaseWakelockCallback; + mCallbacks.create_thread_cb = CreateThreadCallback; + +#ifdef GPS_CAPABILITY_ON_DEMAND_TIME + mCallbacks.request_utc_time_cb = RequestUtcTimeCallback; +#endif + +#ifdef MOZ_B2G_RIL + mAGPSCallbacks.status_cb = AGPSStatusCallback; + mAGPSCallbacks.create_thread_cb = CreateThreadCallback; + + mAGPSRILCallbacks.request_setid = AGPSRILSetIDCallback; + mAGPSRILCallbacks.request_refloc = AGPSRILRefLocCallback; + mAGPSRILCallbacks.create_thread_cb = CreateThreadCallback; +#endif + } + if (mGpsInterface->init(&mCallbacks) != 0) { return; } From 8fb358cc2d90fe5ecd1a14b681e714fc06db4135 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 08:05:31 -0700 Subject: [PATCH 29/50] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9bb25e438865 Author: Dave Hunt Desc: Bug 1033321 - Unable to launch apps with undefined localised names. r=zcampbell --- 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 5d2bd47bb8e2..9f808528ca4c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "eedabf36ee1f6e075523e94e12e3fc6aab9bfc75", + "revision": "9bb25e43886521b685e7347681fc2bcbbd902133", "repo_path": "/integration/gaia-central" } From f42cdc8e1e6cc66caecf0a972bee94be64b531a2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 08:16:20 -0700 Subject: [PATCH 30/50] 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 ca04cf90efc9..835528c60c48 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 4adbc7b12ffd..4632b4138964 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 e61119ddda65..95f3b93aeba5 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 ca04cf90efc9..835528c60c48 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 d1cfd368995b..c620b829f94a 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 8e95c80b25ca..37455f57a9a2 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 b9ccaa03e3e4..a163ab804fce 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 302c6eab0fc3..53d75a389a3c 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 23c921d02838..b8d58b04767e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 9b2ff01950fa71a93c0e22e71c8dbfd936eed7b7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 08:20:27 -0700 Subject: [PATCH 31/50] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8bb248349e9c Author: Dave Hunt Desc: Bug 1033327 - Bump gaiatest version to 0.26. r=zcampbell --- 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 9f808528ca4c..c899a0842b0b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "9bb25e43886521b685e7347681fc2bcbbd902133", + "revision": "8bb248349e9cc57a77788d917cf1ac12f8a30675", "repo_path": "/integration/gaia-central" } From a4187ea44dd3cf6e39ced0b3cd30aede4338cc50 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 08:21:48 -0700 Subject: [PATCH 32/50] 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 835528c60c48..93f37ba8460d 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 4632b4138964..8fbe7dd354a2 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 95f3b93aeba5..f733cb3c124b 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 835528c60c48..93f37ba8460d 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 c620b829f94a..131ca638ce38 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 37455f57a9a2..1a26dcf07ffb 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 a163ab804fce..86d7c46ffa6c 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 53d75a389a3c..0c4729a961a0 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 b8d58b04767e..f3147e82647d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From dd3d998f78c03f3b90c75a5c42964f691f1eee72 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 08:35:27 -0700 Subject: [PATCH 33/50] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/33d9ea721ccc Author: Ryan VanderMeulen Desc: Merge pull request #21238 from clouserw/mkttests add Marketplace to whitelist; Bug 1032953 ======== https://hg.mozilla.org/integration/gaia-central/rev/283ce7489ab9 Author: Wil Clouser Desc: add Marketplace to whitelist; Bug 1032953 ======== https://hg.mozilla.org/integration/gaia-central/rev/a58717709799 Author: Ryan VanderMeulen Desc: Merge pull request #21224 from jfkthame/generic-sans-serif [bug 1032754] Just use font-family:sans-serif ======== https://hg.mozilla.org/integration/gaia-central/rev/a353bbca7538 Author: Jonathan Kew Desc: [bug 1032754] Just use font-family:sans-serif rather than explicitly naming Fira Sans in Gaia CSS. --- 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 c899a0842b0b..13297a7e6eeb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "8bb248349e9cc57a77788d917cf1ac12f8a30675", + "revision": "33d9ea721ccc3995e1e6e5cbabeab4d1ea93be9a", "repo_path": "/integration/gaia-central" } From a434d2a51037037c312109dcb9b37185564d27a9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 08:36:48 -0700 Subject: [PATCH 34/50] 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 93f37ba8460d..f3373f7d9918 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 8fbe7dd354a2..e226a7221660 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 f733cb3c124b..085b6a7a76e6 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 93f37ba8460d..f3373f7d9918 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 131ca638ce38..c092f434694f 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 1a26dcf07ffb..8ea0e20c4f2e 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 86d7c46ffa6c..ce8f652356f9 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 0c4729a961a0..9322805534e3 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 f3147e82647d..d456a2f7f222 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From cbd97baf13d37a1d4ea4b85ea0e1d5feeb2b57c6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 09:20:26 -0700 Subject: [PATCH 35/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cbaa49bbefdc Author: gitmai Desc: Merge pull request #21257 from gitmai/bug-1032836-event-listener-error-testing Bug 1032836 - Intermittent image_loader_test.js | Image Loader Test Suit... r=crdlc ======== https://hg.mozilla.org/integration/gaia-central/rev/ec9aabc8f53c Author: mai Desc: Bug 1032836 - Intermittent image_loader_test.js | Image Loader Test Suite > imgsLoader resuming > resuming calls new Image() | expected Image to be called once but was called twice --- 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 13297a7e6eeb..74471a485608 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "33d9ea721ccc3995e1e6e5cbabeab4d1ea93be9a", + "revision": "cbaa49bbefdc1dad2241e3d138c1add815e52ab0", "repo_path": "/integration/gaia-central" } From c2b5ae9f0ac50035b054bfdb4fcedb239fa6e4eb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 09:26:39 -0700 Subject: [PATCH 36/50] 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 f3373f7d9918..b64ef5538b81 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 e226a7221660..a95f8a858037 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 085b6a7a76e6..b75c852173a6 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 f3373f7d9918..b64ef5538b81 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 c092f434694f..a3587390c42c 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 8ea0e20c4f2e..a571d793ad13 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 ce8f652356f9..d96d53c181c7 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 9322805534e3..a6a9fd0fb243 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 d456a2f7f222..e42b8694753e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 867b8b5d69f1a4eaef7387c68a2755608fd75cf8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 09:45:25 -0700 Subject: [PATCH 37/50] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7af0e127fdda Author: James Burke Desc: Merge pull request #21203 from jrburke/bug1031588-email-back-arrow Bug 1031588 - [B2G][Email]Back arrow on 'New Account' page does not function after deleting two email acccounts r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/05822301a02d Author: jrburke Desc: Bug 1031588 - [B2G][Email]Back arrow on 'New Account' page does not function after deleting two email acccounts ======== https://hg.mozilla.org/integration/gaia-central/rev/53bfafc3e7cc Author: Jared Hirsch Desc: Merge pull request #21240 from 6a68/bug-1032938-use-fmd-prod-servers Bug 1032938 - Point find my device at production servers ======== https://hg.mozilla.org/integration/gaia-central/rev/b59013cbba56 Author: Jared Hirsch Desc: Bug 1032938 - Point find my device at production servers --- 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 74471a485608..5a5bc0c5fb5f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "cbaa49bbefdc1dad2241e3d138c1add815e52ab0", + "revision": "7af0e127fdda4483153d952fae0196a7f13a02f7", "repo_path": "/integration/gaia-central" } From 8349c6e6394332db576f2a3494ae4228b7ee056c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 09:46:47 -0700 Subject: [PATCH 38/50] 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 b64ef5538b81..e7c57bfe9ce8 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 a95f8a858037..5853f0b683a9 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 b75c852173a6..26d7bda28c97 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 b64ef5538b81..e7c57bfe9ce8 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 a3587390c42c..27912a42857c 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 a571d793ad13..79b3fb0927bf 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 d96d53c181c7..256a12c8d06d 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 a6a9fd0fb243..ee71c37e8cb0 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 e42b8694753e..d7febe7e5b25 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 372139bf9ad49a28bb04d106f381b1feb5701c33 Mon Sep 17 00:00:00 2001 From: ffxbld Date: Wed, 2 Jul 2014 10:05:48 -0700 Subject: [PATCH 39/50] No bug, Automated HSTS preload list update from host b-linux64-hp-0034 - a=hsts-update --- .../manager/boot/src/nsSTSPreloadList.errors | 22 +++++++------------ .../manager/boot/src/nsSTSPreloadList.inc | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 9c715be069f0..d81606b5b8cd 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -17,7 +17,7 @@ braintreegateway.com: did not receive HSTS header braintreepayments.com: did not receive HSTS header browserid.org: did not receive HSTS header business.medbank.com.mt: did not receive HSTS header -calyxinstitute.org: could not connect to host +calyxinstitute.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] carlolly.co.uk: did not receive HSTS header cert.se: max-age too low: 2628001 checkout.google.com: did not receive HSTS header (error ignored - included regardless) @@ -54,10 +54,10 @@ googleplex.com: could not connect to host (error ignored - included regardless) goto.google.com: did not receive HSTS header (error ignored - included regardless) greplin.com: did not receive HSTS header groups.google.com: did not receive HSTS header (error ignored - included regardless) -harvestapp.com: could not connect to host +haste.ch: could not connect to host history.google.com: did not receive HSTS header (error ignored - included regardless) hostedtalkgadget.google.com: did not receive HSTS header (error ignored - included regardless) -id.atlassian.com: did not receive HSTS header +id.atlassian.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] in.xero.com: max-age too low: 3600 intercom.io: did not receive HSTS header iop.intuit.com: max-age too low: 86400 @@ -66,12 +66,11 @@ jitsi.org: did not receive HSTS header jottit.com: did not receive HSTS header keymaster.lookout.com: did not receive HSTS header kiwiirc.com: max-age too low: 5256000 -lastpass.com: could not connect to host ledgerscope.net: did not receive HSTS header liberty.lavabit.com: could not connect to host lifeguard.aecom.com: did not receive HSTS header lists.mayfirst.org: did not receive HSTS header -lumi.do: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-hsts-000000000000000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] +lumi.do: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] mail.google.com: did not receive HSTS header (error ignored - included regardless) market.android.com: did not receive HSTS header (error ignored - included regardless) mobilethreat.net: could not connect to host @@ -84,17 +83,15 @@ nexth.de: could not connect to host nexth.net: did not receive HSTS header nexth.us: could not connect to host noexpect.org: could not connect to host -onedrive.live.com: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host paypal.com: max-age too low: 14400 payroll.xero.com: max-age too low: 3600 -pixi.me: could not connect to host platform.lookout.com: could not connect to host play.google.com: did not receive HSTS header (error ignored - included regardless) prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header (error ignored - included regardless) -rapidresearch.me: could not connect to host +rapidresearch.me: did not receive HSTS header riseup.net: did not receive HSTS header sah3.net: could not connect to host saturngames.co.uk: did not receive HSTS header @@ -104,10 +101,8 @@ semenkovich.com: did not receive HSTS header serverdensity.io: did not receive HSTS header shops.neonisi.com: could not connect to host silentcircle.org: could not connect to host -simbolo.co.uk: could not connect to host simon.butcher.name: max-age too low: 2629743 sites.google.com: did not receive HSTS header (error ignored - included regardless) -skydrive.live.com: could not connect to host sol.io: could not connect to host souyar.de: could not connect to host souyar.net: could not connect to host @@ -126,13 +121,13 @@ uprotect.it: could not connect to host wallet.google.com: did not receive HSTS header (error ignored - included regardless) webmail.mayfirst.org: did not receive HSTS header whonix.org: did not receive HSTS header -www.calyxinstitute.org: could not connect to host +www.calyxinstitute.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header (error ignored - included regardless) www.googlemail.com: did not receive HSTS header (error ignored - included regardless) -www.gov.uk: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-hsts-000000000000000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] +www.gov.uk: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] www.greplin.com: could not connect to host www.intercom.io: did not receive HSTS header www.jitsi.org: did not receive HSTS header @@ -142,9 +137,8 @@ www.logentries.com: did not receive HSTS header www.moneybookers.com: did not receive HSTS header www.neonisi.com: could not connect to host www.paycheckrecords.com: max-age too low: 86400 -www.paypal.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-hsts-000000000000000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] +www.paypal.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 124" data: no] www.roddis.net: did not receive HSTS header www.sandbox.mydigipass.com: could not connect to host -www.simbolo.co.uk: could not connect to host www.surfeasy.com: did not receive HSTS header zoo24.de: max-age too low: 2592000 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index d48e02bdabc4..ed0459111bbd 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include -const PRTime gPreloadListExpirationTime = INT64_C(1414837778473000); +const PRTime gPreloadListExpirationTime = INT64_C(1415206745808000); class nsSTSPreload { From 35e5d94a2e489546d80492692df56df3dc64c7b7 Mon Sep 17 00:00:00 2001 From: ffxbld Date: Wed, 2 Jul 2014 10:05:51 -0700 Subject: [PATCH 40/50] No bug, Automated HPKP preload list update from host b-linux64-hp-0034 - a=hpkp-update --- .../manager/boot/src/StaticHPKPins.errors | 24 ------------------- security/manager/boot/src/StaticHPKPins.h | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/security/manager/boot/src/StaticHPKPins.errors b/security/manager/boot/src/StaticHPKPins.errors index d5a7e86d2cef..8b4b32d73d61 100644 --- a/security/manager/boot/src/StaticHPKPins.errors +++ b/security/manager/boot/src/StaticHPKPins.errors @@ -1,30 +1,6 @@ -+ set -e -+ OBJ=obj-x86_64-unknown-linux-gnu -+ obj-x86_64-unknown-linux-gnu/dist/bin/run-mozilla.sh obj-x86_64-unknown-linux-gnu/dist/bin/xpcshell /home/mchew/mozilla-central/security/manager/tools/genHPKPStaticPins.js /home/mchew/mozilla-central/security/manager/tools/PreloadedHPKPins.json /home/mchew/mozilla-central/security/manager/ssl/tests/unit/tlsserver/default-ee.der /home/mchew/mozilla-central/security/manager/boot/src/StaticHPKPins.h -[32405] WARNING: NS_ENSURE_SUCCESS(rv, nsresult::NS_ERROR_UNEXPECTED) failed with result 0x80004005: file /home/mchew/mozilla-central/extensions/cookie/nsPermissionManager.cpp, line 444 -[32405] WARNING: Forcing memory-only entry since CacheFileIOManager doesn't have mCacheDirectory.: file /home/mchew/mozilla-central/netwerk/cache2/CacheFile.cpp, line 474 -[32405] WARNING: Forcing memory-only entry since CacheFileIOManager doesn't have mCacheDirectory.: file /home/mchew/mozilla-central/netwerk/cache2/CacheFile.cpp, line 474 Can't find hash in builtin certs for Chrome nickname RapidSSL, inserting GOOGLE_PIN_RapidSSL Can't find hash in builtin certs for Chrome nickname Entrust_G2, inserting GOOGLE_PIN_Entrust_G2 Can't find hash in builtin certs for Chrome nickname Tor2web, inserting GOOGLE_PIN_Tor2web Can't find hash in builtin certs for Chrome nickname AlphaSSL_G2, inserting GOOGLE_PIN_AlphaSSL_G2 Can't find hash in builtin certs for Chrome nickname CryptoCat1, inserting GOOGLE_PIN_CryptoCat1 Can't find hash in builtin certs for Chrome nickname Libertylavabitcom, inserting GOOGLE_PIN_Libertylavabitcom -[32405] WARNING: Forcing memory-only entry since CacheFileIOManager doesn't have mCacheDirectory.: file /home/mchew/mozilla-central/netwerk/cache2/CacheFile.cpp, line 474 -[32405] WARNING: '!mMainThread', file /home/mchew/mozilla-central/xpcom/threads/nsThreadManager.cpp, line 279 -[32405] WARNING: '!thread', file /home/mchew/mozilla-central/xpcom/glue/nsThreadUtils.cpp, line 194 -[32405] WARNING: '!thread', file /home/mchew/mozilla-central/xpcom/glue/nsThreadUtils.cpp, line 194 -[32405] WARNING: '!mMainThread', file /home/mchew/mozilla-central/xpcom/threads/nsThreadManager.cpp, line 269 -[32405] WARNING: 'NS_FAILED(rv)', file /home/mchew/mozilla-central/xpcom/glue/nsThreadUtils.cpp, line 180 -[32405] WARNING: Leaking the RDF Service.: file /home/mchew/mozilla-central/rdf/build/nsRDFModule.cpp, line 165 -[32405] WARNING: '!compMgr', file /home/mchew/mozilla-central/xpcom/glue/nsComponentManagerUtils.cpp, line 59 -[32405] WARNING: XPCOM objects created/destroyed from static ctor/dtor: file /home/mchew/mozilla-central/xpcom/base/nsTraceRefcnt.cpp, line 148 -[32405] WARNING: XPCOM objects created/destroyed from static ctor/dtor: file /home/mchew/mozilla-central/xpcom/base/nsTraceRefcnt.cpp, line 148 -nsStringStats - => mAllocCount: 3577 - => mReallocCount: 444 - => mFreeCount: 3577 - => mShareCount: 8797 - => mAdoptCount: 177 - => mAdoptFreeCount: 177 - => Process ID: 32405, Thread ID: 140248381782592 diff --git a/security/manager/boot/src/StaticHPKPins.h b/security/manager/boot/src/StaticHPKPins.h index 7179b25b655a..dd3c9bee00b5 100644 --- a/security/manager/boot/src/StaticHPKPins.h +++ b/security/manager/boot/src/StaticHPKPins.h @@ -998,4 +998,4 @@ static const int kPublicKeyPinningPreloadListLength = 322; static const int32_t kUnknownId = -1; -static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1414009276397000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1415206756678000); From d77818665bee1b2ca5bcd335e82ccc630e93b10b Mon Sep 17 00:00:00 2001 From: ffxbld Date: Wed, 2 Jul 2014 10:05:55 -0700 Subject: [PATCH 41/50] No bug, Automated blocklist update from host b-linux64-hp-0034 - a=blocklist-update --- browser/app/blocklist.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 225701e6bf14..31af8efaa8d6 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ - + @@ -554,6 +554,12 @@ + + + + + + From 8a4d765a291f8c50af6955b5f1b13e9194104108 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 2 Jul 2014 18:17:50 +0100 Subject: [PATCH 42/50] Backed out changeset 1b9e9be1db29 (bug 1030277) for intermittent test failures --- mobile/android/base/db/BrowserContract.java | 14 - .../base/db/BrowserDatabaseHelper.java | 27 +- .../base/db/SearchHistoryProvider.java | 112 -------- mobile/android/base/moz.build | 1 - mobile/android/base/tests/robocop.ini | 1 - .../base/tests/testSearchHistoryProvider.java | 269 ------------------ 6 files changed, 2 insertions(+), 422 deletions(-) delete mode 100644 mobile/android/base/db/SearchHistoryProvider.java delete mode 100644 mobile/android/base/tests/testSearchHistoryProvider.java diff --git a/mobile/android/base/db/BrowserContract.java b/mobile/android/base/db/BrowserContract.java index 90b81490569d..cc60b550357c 100644 --- a/mobile/android/base/db/BrowserContract.java +++ b/mobile/android/base/db/BrowserContract.java @@ -33,9 +33,6 @@ public class BrowserContract { public static final String READING_LIST_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".db.readinglist"; public static final Uri READING_LIST_AUTHORITY_URI = Uri.parse("content://" + READING_LIST_AUTHORITY); - public static final String SEARCH_HISTORY_AUTHORITY = AppConstants.ANDROID_PACKAGE_NAME + ".db.searchhistory"; - public static final Uri SEARCH_HISTORY_AUTHORITY_URI = Uri.parse("content://" + SEARCH_HISTORY_AUTHORITY); - public static final String PARAM_PROFILE = "profile"; public static final String PARAM_PROFILE_PATH = "profilePath"; public static final String PARAM_LIMIT = "limit"; @@ -436,17 +433,6 @@ public class BrowserContract { public static final String TYPE = "type"; } - @RobocopTarget - public static final class SearchHistory implements CommonColumns, HistoryColumns { - private SearchHistory() {} - - public static final String CONTENT_TYPE = "vnd.android.cursor.dir/searchhistory"; - public static final String QUERY = "query"; - public static final String TABLE_NAME = "searchhistory"; - - public static final Uri CONTENT_URI = Uri.withAppendedPath(SEARCH_HISTORY_AUTHORITY_URI, "searchhistory"); - } - @RobocopTarget public static final class SuggestedSites implements CommonColumns, URLColumns { private SuggestedSites() {} diff --git a/mobile/android/base/db/BrowserDatabaseHelper.java b/mobile/android/base/db/BrowserDatabaseHelper.java index 5b44f689fc53..dd7c5745ee77 100644 --- a/mobile/android/base/db/BrowserDatabaseHelper.java +++ b/mobile/android/base/db/BrowserDatabaseHelper.java @@ -16,7 +16,6 @@ import org.mozilla.gecko.db.BrowserContract.Favicons; import org.mozilla.gecko.db.BrowserContract.History; import org.mozilla.gecko.db.BrowserContract.Obsolete; import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.db.BrowserContract.SearchHistory; import org.mozilla.gecko.db.BrowserContract.Thumbnails; import org.mozilla.gecko.sync.Utils; @@ -35,7 +34,7 @@ import android.util.Log; final class BrowserDatabaseHelper extends SQLiteOpenHelper { private static final String LOGTAG = "GeckoBrowserDBHelper"; - public static final int DATABASE_VERSION = 19; + public static final int DATABASE_VERSION = 18; public static final String DATABASE_NAME = "browser.db"; final protected Context mContext; @@ -750,20 +749,6 @@ final class BrowserDatabaseHelper extends SQLiteOpenHelper { createOrUpdateAllSpecialFolders(db); createReadingListTable(db); - createSearchHistoryTable(db); - } - - private void createSearchHistoryTable(SQLiteDatabase db) { - debug("Creating " + SearchHistory.TABLE_NAME + " table"); - - db.execSQL("CREATE TABLE " + SearchHistory.TABLE_NAME + "(" + - SearchHistory._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " + - SearchHistory.QUERY + " TEXT UNIQUE NOT NULL, " + - SearchHistory.DATE_LAST_VISITED + " INTEGER, " + - SearchHistory.VISITS + " INTEGER ) "); - - db.execSQL("CREATE INDEX idx_search_history_last_visited ON " + - SearchHistory.TABLE_NAME + "(" + SearchHistory.DATE_LAST_VISITED + ")"); } private void createReadingListTable(SQLiteDatabase db) { @@ -1393,10 +1378,6 @@ final class BrowserDatabaseHelper extends SQLiteOpenHelper { } } - private void upgradeDatabaseFrom18to19(SQLiteDatabase db) { - createSearchHistoryTable(db); - } - @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { debug("Upgrading browser.db: " + db.getPath() + " from " + @@ -1473,10 +1454,6 @@ final class BrowserDatabaseHelper extends SQLiteOpenHelper { case 18: upgradeDatabaseFrom17to18(db); break; - - case 19: - upgradeDatabaseFrom18to19(db); - break; } } @@ -1589,4 +1566,4 @@ final class BrowserDatabaseHelper extends SQLiteOpenHelper { bookmark.remove("folder"); } } -} +} \ No newline at end of file diff --git a/mobile/android/base/db/SearchHistoryProvider.java b/mobile/android/base/db/SearchHistoryProvider.java deleted file mode 100644 index 7d43d2fe085a..000000000000 --- a/mobile/android/base/db/SearchHistoryProvider.java +++ /dev/null @@ -1,112 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.gecko.db; - -import org.mozilla.gecko.db.BrowserContract.SearchHistory; - -import android.content.ContentUris; -import android.content.ContentValues; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.net.Uri; -import android.text.TextUtils; - -public class SearchHistoryProvider extends SharedBrowserDatabaseProvider { - - /** - * Collapse whitespace. - */ - private String stripWhitespace(String query) { - if (TextUtils.isEmpty(query)) { - return ""; - } - - // Collapse whitespace - return query.trim().replaceAll("\\s+", " "); - } - - - @Override - public Uri insertInTransaction(Uri uri, ContentValues cv) { - final String query = stripWhitespace(cv.getAsString(SearchHistory.QUERY)); - - // We don't support inserting empty search queries. - if (TextUtils.isEmpty(query)) { - return null; - } - - final SQLiteDatabase db = getWritableDatabase(uri); - - /* - * FIRST: Try incrementing the VISITS counter and updating the DATE_LAST_VISITED. - */ - final String sql = "UPDATE " + SearchHistory.TABLE_NAME + " SET " + - SearchHistory.VISITS + " = " + SearchHistory.VISITS + " + 1, " + - SearchHistory.DATE_LAST_VISITED + " = " + System.currentTimeMillis() + - " WHERE " + SearchHistory.QUERY + " = ?"; - final Cursor c = db.rawQuery(sql, new String[] { query }); - - try { - if (c.getCount() > 1) { - // There is a UNIQUE constraint on the QUERY column, - // so there should only be one match. - return null; - } - if (c.moveToFirst()) { - return ContentUris - .withAppendedId(uri, c.getInt(c.getColumnIndex(SearchHistory._ID))); - } - } finally { - c.close(); - } - - /* - * SECOND: If the update failed, then insert a new record. - */ - cv.put(SearchHistory.QUERY, query); - cv.put(SearchHistory.VISITS, 1); - cv.put(SearchHistory.DATE_LAST_VISITED, System.currentTimeMillis()); - - long id = db.insert(SearchHistory.TABLE_NAME, null, cv); - - if (id < 0) { - return null; - } - - return ContentUris.withAppendedId(uri, id); - } - - @Override - public int deleteInTransaction(Uri uri, String selection, String[] selectionArgs) { - return getWritableDatabase(uri) - .delete(SearchHistory.TABLE_NAME, selection, selectionArgs); - } - - /** - * Since we are managing counts and the full-text db, an update - * could mangle the internal state. So we disable it. - */ - @Override - public int updateInTransaction(Uri uri, ContentValues values, String selection, - String[] selectionArgs) { - throw new UnsupportedOperationException( - "This content provider does not support updating items"); - } - - @Override - public Cursor query(Uri uri, String[] projection, String selection, - String[] selectionArgs, String sortOrder) { - String groupBy = null; - String having = null; - return getReadableDatabase(uri) - .query(SearchHistory.TABLE_NAME, projection, selection, selectionArgs, - groupBy, having, sortOrder); - } - - @Override - public String getType(Uri uri) { - return SearchHistory.CONTENT_TYPE; - } -} diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index 73da65e63ea7..9e1ec684446f 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -150,7 +150,6 @@ gbjar.sources += [ 'db/PerProfileDatabaseProvider.java', 'db/PerProfileDatabases.java', 'db/ReadingListProvider.java', - 'db/SearchHistoryProvider.java', 'db/SharedBrowserDatabaseProvider.java', 'db/SQLiteBridgeContentProvider.java', 'db/SuggestedSites.java', diff --git a/mobile/android/base/tests/robocop.ini b/mobile/android/base/tests/robocop.ini index 53ed4321817f..3021b48d0381 100644 --- a/mobile/android/base/tests/robocop.ini +++ b/mobile/android/base/tests/robocop.ini @@ -80,7 +80,6 @@ skip-if = processor == "x86" skip-if = processor == "x86" # [testReaderMode] # see bug 913254, 936224 [testReadingListProvider] -[testSearchHistoryProvider] [testSearchSuggestions] # disabled on x86; bug 907768 skip-if = processor == "x86" diff --git a/mobile/android/base/tests/testSearchHistoryProvider.java b/mobile/android/base/tests/testSearchHistoryProvider.java deleted file mode 100644 index ab527c8d49be..000000000000 --- a/mobile/android/base/tests/testSearchHistoryProvider.java +++ /dev/null @@ -1,269 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.gecko.tests; - -import java.util.concurrent.Callable; - -import org.mozilla.gecko.db.BrowserContract; -import org.mozilla.gecko.db.BrowserContract.SearchHistory; -import org.mozilla.gecko.db.SearchHistoryProvider; - -import android.content.ContentProvider; -import android.content.ContentValues; -import android.database.Cursor; - -public class testSearchHistoryProvider extends ContentProviderTest { - - // Translations of "United Kingdom" in several different languages - private static final String[] testStrings = {"An Ríocht Aontaithe", // Irish - "Angli", // Albanian - "Britanniarum Regnum", // Latin - "Britio", // Esperanto - "Büyük Britanya", // Turkish - "Egyesült Királyság", // Hungarian - "Erresuma Batua", // Basque - "Inggris Raya", // Indonesian - "Ir-Renju Unit", // Maltese - "Iso-Britannia", // Finnish - "Jungtinė Karalystė", // Lithuanian - "Lielbritānija", // Latvian - "Regatul Unit", // Romanian - "Regne Unit", // Catalan, Valencian - "Regno Unito", // Italian - "Royaume-Uni", // French - "Spojené království", // Czech - "Spojené kráľovstvo", // Slovak - "Storbritannia", // Norwegian - "Storbritannien", // Danish - "Suurbritannia", // Estonian - "Ujedinjeno Kraljevstvo", // Bosnian - "United Alaeze", // Igbo - "United Kingdom", // English - "Vereinigtes Königreich", // German - "Verenigd Koninkrijk", // Dutch - "Verenigde Koninkryk", // Afrikaans - "Vương quốc Anh", // Vietnamese - "Wayòm Ini", // Haitian, Haitian Creole - "Y Deyrnas Unedig", // Welsh - "Združeno kraljestvo", // Slovene - "Zjednoczone Królestwo", // Polish - "Ηνωμένο Βασίλειο", // Greek (modern) - "Великобритания", // Russian - "Нэгдсэн Вант Улс", // Mongolian - "Обединетото Кралство", // Macedonian - "Уједињено Краљевство", // Serbian - "Միացյալ Թագավորություն", // Armenian - "בריטניה", // Hebrew (modern) - "פֿאַראייניקטע מלכות", // Yiddish - "المملكة المتحدة", // Arabic - "برطانیہ", // Urdu - "پادشاهی متحده", // Persian (Farsi) - "यूनाइटेड किंगडम", // Hindi - "संयुक्त राज्य", // Nepali - "যুক্তরাজ্য", // Bengali, Bangla - "યુનાઇટેડ કિંગડમ", // Gujarati - "ஐக்கிய ராஜ்யம்", // Tamil - "สหราชอาณาจักร", // Thai - "ສະ​ຫະ​ປະ​ຊາ​ຊະ​ອາ​ນາ​ຈັກ", // Lao - "გაერთიანებული სამეფო", // Georgian - "イギリス", // Japanese - "联合王国" // Chinese - }; - - - private static final String DB_NAME = "searchhistory.db"; - - /** - * Boilerplate alert. - *

- * Make sure this method is present and that it returns a new - * instance of your class. - */ - private static Callable sProviderFactory = - new Callable() { - @Override - public ContentProvider call() { - return new SearchHistoryProvider(); - } - }; - - @Override - public void setUp() throws Exception { - super.setUp(sProviderFactory, BrowserContract.SEARCH_HISTORY_AUTHORITY, DB_NAME); - mTests.add(new TestInsert()); - mTests.add(new TestUnicodeQuery()); - mTests.add(new TestTimestamp()); - mTests.add(new TestDelete()); - mTests.add(new TestIncrement()); - } - - public void testSearchHistory() throws Exception { - for (Runnable test : mTests) { - String testName = test.getClass().getSimpleName(); - setTestName(testName); - mAsserter.dumpLog( - "testBrowserProvider: Database empty - Starting " + testName + "."); - // Clear the db - mProvider.delete(SearchHistory.CONTENT_URI, null, null); - test.run(); - } - } - - /** - * Verify that we can insert values into the DB, including unicode. - */ - private class TestInsert extends TestCase { - @Override - public void test() throws Exception { - ContentValues cv; - for (int i = 0; i < testStrings.length; i++) { - cv = new ContentValues(); - cv.put(SearchHistory.QUERY, testStrings[i]); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - } - - Cursor c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - mAsserter.is(c.getCount(), testStrings.length, - "Should have one row for each insert"); - - c.close(); - } - } - - /** - * Verify that we can insert values into the DB, including unicode. - */ - private class TestUnicodeQuery extends TestCase { - @Override - public void test() throws Exception { - ContentValues cv; - Cursor c = null; - String selection = SearchHistory.QUERY + " = ?"; - - for (int i = 0; i < testStrings.length; i++) { - cv = new ContentValues(); - cv.put(SearchHistory.QUERY, testStrings[i]); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - - c = mProvider.query(SearchHistory.CONTENT_URI, null, selection, - new String[]{ testStrings[i] }, null); - mAsserter.is(c.getCount(), 1, - "Should have one row for insert of " + testStrings[i]); - } - - if (c != null) { - c.close(); - } - } - } - - /** - * Verify that timestamps are updated on insert. - */ - private class TestTimestamp extends TestCase { - @Override - public void test() throws Exception { - String insertedTerm = "Courtside Seats"; - long insertStart; - long insertFinish; - long t1Db; - long t2Db; - - ContentValues cv = new ContentValues(); - cv.put(SearchHistory.QUERY, insertedTerm); - - // First check that the DB has a value that is close to the - // system time. - insertStart = System.currentTimeMillis(); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - Cursor c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - c.moveToFirst(); - t1Db = c.getLong(c.getColumnIndex(SearchHistory.DATE_LAST_VISITED)); - c.close(); - insertFinish = System.currentTimeMillis(); - mAsserter.ok(t1Db >= insertStart, "DATE_LAST_VISITED", - "Date last visited should be set on insert."); - mAsserter.ok(t1Db <= insertFinish, "DATE_LAST_VISITED", - "Date last visited should be set on insert."); - - cv = new ContentValues(); - cv.put(SearchHistory.QUERY, insertedTerm); - - insertStart = System.currentTimeMillis(); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - c.moveToFirst(); - t2Db = c.getLong(c.getColumnIndex(SearchHistory.DATE_LAST_VISITED)); - c.close(); - insertFinish = System.currentTimeMillis(); - - mAsserter.ok(t2Db >= insertStart, "DATE_LAST_VISITED", - "Date last visited should be set on insert."); - mAsserter.ok(t2Db <= insertFinish, "DATE_LAST_VISITED", - "Date last visited should be set on insert."); - mAsserter.ok(t2Db > t1Db, "DATE_LAST_VISITED", - "Date last visited should be updated on key increment."); - } - } - - /** - * Verify that sending a delete command empties the database. - */ - private class TestDelete extends TestCase { - @Override - public void test() throws Exception { - String insertedTerm = "Courtside Seats"; - - ContentValues cv = new ContentValues(); - cv.put(SearchHistory.QUERY, insertedTerm); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - - Cursor c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - mAsserter.is(c.getCount(), 1, "Should have one value"); - mProvider.delete(SearchHistory.CONTENT_URI, null, null); - c.close(); - - c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - mAsserter.is(c.getCount(), 0, "Should be empty"); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - c.close(); - - c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - mAsserter.is(c.getCount(), 1, "Should have one value"); - c.close(); - } - } - - - /** - * Ensure that we only increment when the case matches. - */ - private class TestIncrement extends TestCase { - @Override - public void test() throws Exception { - ContentValues cv = new ContentValues(); - cv.put(SearchHistory.QUERY, "omaha"); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - - cv = new ContentValues(); - cv.put(SearchHistory.QUERY, "omaha"); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - - Cursor c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - c.moveToFirst(); - mAsserter.is(c.getCount(), 1, "Should have one result"); - mAsserter.is(c.getInt(c.getColumnIndex(SearchHistory.VISITS)), 2, - "Counter should be 2"); - c.close(); - - cv = new ContentValues(); - cv.put(SearchHistory.QUERY, "Omaha"); - mProvider.insert(SearchHistory.CONTENT_URI, cv); - c = mProvider.query(SearchHistory.CONTENT_URI, null, null, null, null); - mAsserter.is(c.getCount(), 2, "Should have two results"); - c.close(); - } - } -} From 1095f43ce5582938a26dcae4ea29fb499dd73148 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 11:10:30 -0700 Subject: [PATCH 43/50] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a58a1579a5fd Author: Pavel Ivanov Desc: Merge pull request #21138 from pivanov/bug-1030655 Bug 1030655 - [Flame][Email] - fuzzy clear icon ======== https://hg.mozilla.org/integration/gaia-central/rev/196ebd9da323 Author: Pavel Ivanov Desc: Bug 1030655 - [Flame][Email] - fuzzy clear icon ======== https://hg.mozilla.org/integration/gaia-central/rev/8ef1eb02fa74 Author: Douglas Sherk Desc: Merge pull request #21241 from DouglasSherk/1030546-dialer-share-localization Bug 1030546 - [Dialer] Share keypad localization data across the dialer and emergency-call apps. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/e4dc541908ff Author: DouglasSherk Desc: Bug 1030546 - [Dialer] Share keypad localization data across the dialer and emergency-call apps. r=etienne --- 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 5a5bc0c5fb5f..fe5a22c51475 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "7af0e127fdda4483153d952fae0196a7f13a02f7", + "revision": "a58a1579a5fd8c3927e5eeafff6ea6f727337571", "repo_path": "/integration/gaia-central" } From 874167e1b9b0653d52ab3e8fae0cfd248283922d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 11:14:25 -0700 Subject: [PATCH 44/50] 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 e7c57bfe9ce8..7fcc68254e26 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 5853f0b683a9..ef894bc95d8e 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 26d7bda28c97..3ab433931f79 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 e7c57bfe9ce8..7fcc68254e26 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 27912a42857c..b18f8e9325a3 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 79b3fb0927bf..ac3804d4151a 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 256a12c8d06d..0642fdddc069 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 ee71c37e8cb0..f1fa4ceea867 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 d7febe7e5b25..e34474733ac5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3f4a0b113664a981c313880594a54a83c6d8a9e7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 11:25:22 -0700 Subject: [PATCH 45/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2c66d42bf145 Author: Douglas Sherk Desc: Merge pull request #21248 from DouglasSherk/1032502-callscreen-phone-label Bug 1032502 - [Dialer][Contacts][Callscreen] Fix phone type label not being localized on callscreen. r=francisco ======== https://hg.mozilla.org/integration/gaia-central/rev/336e98ecf529 Author: DouglasSherk Desc: Bug 1032502 - [Dialer][Contacts][Callscreen] Fix phone type label not being localized on callscreen. r=francisco --- 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 fe5a22c51475..e4bc011e17bb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "a58a1579a5fd8c3927e5eeafff6ea6f727337571", + "revision": "2c66d42bf145a0f0d209daba36e3ff058ebf4917", "repo_path": "/integration/gaia-central" } From 30b5e2bf76bf1f565c7272fc6854f9d849d05902 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 11:31:36 -0700 Subject: [PATCH 46/50] 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 7fcc68254e26..2662fc6e9e88 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 ef894bc95d8e..853acd76597d 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 3ab433931f79..5d6666d24a3a 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 7fcc68254e26..2662fc6e9e88 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 b18f8e9325a3..c2e77163e3ac 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 ac3804d4151a..1ca80bb5c45c 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 0642fdddc069..783eb7f915fb 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 f1fa4ceea867..865767fbfef2 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 e34474733ac5..67b4182f707a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 5ca36531b439f676152451447855dbe5cc5a97bb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 12:50:29 -0700 Subject: [PATCH 47/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/dad0a9071115 Author: Yura Zenevich Desc: Merge pull request #20823 from yzen/bug-1019362 Bug 1019362 - adding a number of gaia ui tests for the first time use ap... ======== https://hg.mozilla.org/integration/gaia-central/rev/ff5d9c34aaef Author: Yura Zenevich Desc: Bug 1019362 - adding a number of gaia ui tests for the first time use app accessibility. --- 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 e4bc011e17bb..66a5c3e3600c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "2c66d42bf145a0f0d209daba36e3ff058ebf4917", + "revision": "dad0a907111517270f1fc927db5b484e700688c7", "repo_path": "/integration/gaia-central" } From e96a0a3d002d5d5e7e1615b1bfa1ab01f0041e87 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 12:51:48 -0700 Subject: [PATCH 48/50] 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 2662fc6e9e88..9eaf2a0f0360 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 853acd76597d..4c4530ff322e 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 5d6666d24a3a..268e5e5faa5b 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 2662fc6e9e88..9eaf2a0f0360 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 c2e77163e3ac..78695777b7fc 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 1ca80bb5c45c..ab6f55989325 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 783eb7f915fb..625652776661 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 865767fbfef2..7b09d3e4380b 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 67b4182f707a..15fe095e0322 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8c30cc2882def4352c11c72ec0c8c44e7a539e98 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 13:20:26 -0700 Subject: [PATCH 49/50] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4e3596b10de8 Author: James Burke Desc: Merge pull request #21297 from jrburke/bug911412-email-view-icon Bug 911412 - [Buri][fugu][Language][Email]The view the attachment Button is truncated r=jrburke ======== https://hg.mozilla.org/integration/gaia-central/rev/e4f160a2a0f1 Author: praveen.singapati Desc: Bug 911412 - [Buri][fugu][Language][Email]The view the attachment Button is truncated as per comments small nit --- 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 66a5c3e3600c..7a57e3aaf7d8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "dad0a907111517270f1fc927db5b484e700688c7", + "revision": "4e3596b10de8df9202d9c0a7f64b7913bdfaaead", "repo_path": "/integration/gaia-central" } From c3cbcd924ea61ebfa97684e6ccc15360c302f5b7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Jul 2014 13:26:10 -0700 Subject: [PATCH 50/50] 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 9eaf2a0f0360..c73fb03b675c 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 4c4530ff322e..ab6600118ad6 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 268e5e5faa5b..25d9fc2cbaa1 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 9eaf2a0f0360..c73fb03b675c 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 78695777b7fc..7bbc867d6e90 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 ab6f55989325..7c3cc3ae4d6b 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 625652776661..d4b3a04102c3 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 7b09d3e4380b..352bcb2c8ed5 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 15fe095e0322..845844a35d1c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +