From 3fe0bc789cb700b750c5f087e1b1acd87d0239b9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 11:30:23 -0800 Subject: [PATCH 01/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/566953ef93e6 Author: Marcus Cavanaugh Desc: Merge pull request #16909 from mcav/alarm-bar Bug 979530 - [B2G][Clock] The text alarm in the notification banner is cut off. r=jrburke ======== https://hg.mozilla.org/integration/gaia-central/rev/a73b0c548ddd Author: Marcus Cavanaugh Desc: Bug 979530 - [B2G][Clock] The text alarm in the notification banner is cutoff --- 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 6ec57a973960..c7e2bc280c7b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "5d470e57a89125a55663058050b2cd147630a948", + "revision": "566953ef93e6cd8ba592ea2f264b38a7bda4cf53", "repo_path": "/integration/gaia-central" } From 2e6e84fa0e52dc80340f6b07c5d415f0d1af817e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 11:35:50 -0800 Subject: [PATCH 02/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 231bb04b970f..5091e6f99266 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 2dd43d361924..b76a16b3e97e 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/sources.xml b/b2g/config/emulator/sources.xml index 231bb04b970f..5091e6f99266 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 387e7e458b72..847d38866102 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 09ac0ccd380c..484f8f864702 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 118f70425ca2..af2c75a25d19 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 80d6bde1e9a8..fadeab877241 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 63a5d534f953..5cf2f35019ab 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 02ccba944420..e1653e9297fc 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From cfaa473489672e60fa4145e77b82cbaf687855f9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 11:55:22 -0800 Subject: [PATCH 03/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c7a34ae95f67 Author: Pavel Ivanov Desc: Merge pull request #16667 from pivanov/bug-949024 Bug 949024 - Update Branded Wallpapers Sizes for v.1.4 ======== https://hg.mozilla.org/integration/gaia-central/rev/11cfc3fcb2a0 Author: Pavel Ivanov Desc: Bug 949024 - Update Branded Wallpapers Sizes for v.1.4 --- 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 c7e2bc280c7b..f001955dca45 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "566953ef93e6cd8ba592ea2f264b38a7bda4cf53", + "revision": "c7a34ae95f67bef811de5c8514142908fe056f51", "repo_path": "/integration/gaia-central" } From 92a43620a1cadeb427f3e1ef5c20b4323215f319 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 12:01:08 -0800 Subject: [PATCH 04/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 5091e6f99266..0f2cf0b50929 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 b76a16b3e97e..79351cc56eeb 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/sources.xml b/b2g/config/emulator/sources.xml index 5091e6f99266..0f2cf0b50929 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 847d38866102..9c854188e89e 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 484f8f864702..29b8910cbf67 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index af2c75a25d19..5cc450455735 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index fadeab877241..98f306f9b123 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 5cf2f35019ab..8c9656f3839e 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index e1653e9297fc..b4602d834430 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 296f9a085fad239aaff039757c3de1db5f77934f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 12:05:23 -0800 Subject: [PATCH 05/22] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a19581a56f75 Author: Pavel Ivanov Desc: Merge pull request #16918 from pivanov/bug-979696 Folowup patch for Bug 979696 ======== https://hg.mozilla.org/integration/gaia-central/rev/87eec8bd392a Author: Pavel Ivanov Desc: Folowup patch for Bug 979696 ======== https://hg.mozilla.org/integration/gaia-central/rev/73bd440eef89 Author: Pavel Ivanov Desc: Merge pull request #16908 from pivanov/bug-979696 Bug 979696 - Update Photographic Wallpapers Sizes for 1.4 ======== https://hg.mozilla.org/integration/gaia-central/rev/cca85e9f8e17 Author: Pavel Ivanov Desc: Bug 979696 - Update Photographic Wallpapers Sizes for 1.4 --- 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 f001955dca45..d385477e1c2c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "c7a34ae95f67bef811de5c8514142908fe056f51", + "revision": "a19581a56f753e86220ceabd632a7a35d6f8626e", "repo_path": "/integration/gaia-central" } From 9ea8c8b6bc7c670347fa6e25633eb259762d6425 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 12:11:10 -0800 Subject: [PATCH 06/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 0f2cf0b50929..5a1d75689d41 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 79351cc56eeb..a17eb1561820 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/sources.xml b/b2g/config/emulator/sources.xml index 0f2cf0b50929..5a1d75689d41 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9c854188e89e..8ad7c65dc8ea 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 29b8910cbf67..71ff3287ae45 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 5cc450455735..053f2e99de35 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 98f306f9b123..50cef680c1fa 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 8c9656f3839e..85318ff9a90d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index b4602d834430..e10ccd57d674 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e7157883bcb9d41b9a9078bbbc1e9405df300619 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 12:35:25 -0800 Subject: [PATCH 07/22] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/92e7b0175abd Author: Gareth Aye Desc: Merge pull request #16907 from millermedeiros/972666-lines-over-events-2 Bug 972666 - [Calendar] lines over events longer than 2 hours r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/41e352749ff5 Author: Miller Medeiros Desc: Bug 972666 - [Calendar] lines over events longer than 2 hours ======== https://hg.mozilla.org/integration/gaia-central/rev/82970d7816cd Author: Gareth Aye Desc: Merge pull request #16912 from millermedeiros/979969-marionette-is-view-active Bug 979969 - [Calendar] calendar.isViewActive should check if element is really "active" on the marionette tests r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/11cc4d709a3d Author: Miller Medeiros Desc: Bug 979969 - [Calendar] calendar.isViewActive should check if element is really "active" on the marionette tests --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index d385477e1c2c..37de7be28a83 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "a19581a56f753e86220ceabd632a7a35d6f8626e", + "revision": "92e7b0175abd7640f0bce1b63a2be715fb988aad", "repo_path": "/integration/gaia-central" } From 552a8d8d8ca2a779fd3d89bc7417683f3222e973 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 12:40:51 -0800 Subject: [PATCH 08/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 5a1d75689d41..46195a598e25 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 a17eb1561820..a7157c8ae931 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/sources.xml b/b2g/config/emulator/sources.xml index 5a1d75689d41..46195a598e25 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8ad7c65dc8ea..9913b1a7e9d8 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 71ff3287ae45..a09714915318 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 053f2e99de35..0eaec87bf6be 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 50cef680c1fa..8e8927e08359 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 85318ff9a90d..ff9841a4bec0 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index e10ccd57d674..19afda5a736a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 51031ace4c524dba431705e2fb4dda53f405e1c5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 14:40:27 -0800 Subject: [PATCH 09/22] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e030bdb4b6db Author: Dale Harvey Desc: Bug 975161 - Reland ensure SIM Pin inputs are visible. r=vingetun This reverts commit 05337d2ce75651550892ca883030548ed5f7d6aa. --- 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 37de7be28a83..6f3979fe53f4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "92e7b0175abd7640f0bce1b63a2be715fb988aad", + "revision": "e030bdb4b6db86bf348d61299cc183e55795eb82", "repo_path": "/integration/gaia-central" } From 86a4f1c6c4f6c30435dd6ab37d9e47a651dde027 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 14:45:54 -0800 Subject: [PATCH 10/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 46195a598e25..5972e492ec0b 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 a7157c8ae931..8b30aded8271 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/sources.xml b/b2g/config/emulator/sources.xml index 46195a598e25..5972e492ec0b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9913b1a7e9d8..d3f6e45d9cef 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 a09714915318..75eb670c9adf 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 0eaec87bf6be..25bec2c23493 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8e8927e08359..eef43c3633b4 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index ff9841a4bec0..2049dd489aa5 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 19afda5a736a..5c6339ab9429 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 5d81022a40c71031a4f0189037181cd2aafaa2fb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 14:50:24 -0800 Subject: [PATCH 11/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c10a5f7f7e2f Author: Diego Marcos Desc: Merge pull request #16819 from dmarcos/bug974730 Bug 974730 - [Camera] Camera Library has to listen for the onPreviewStat... ======== https://hg.mozilla.org/integration/gaia-central/rev/c82911658e3a Author: Diego Marcos Desc: Bug 974730 - [Camera] Camera Library has to listen for the onPreviewStateChange event --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6f3979fe53f4..8577d39a0c55 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "e030bdb4b6db86bf348d61299cc183e55795eb82", + "revision": "c10a5f7f7e2f804ce91ce1a4ebb83811788220fe", "repo_path": "/integration/gaia-central" } From a2664abe198f53e33c4836dd84fce930cde35d3b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 14:51:33 -0800 Subject: [PATCH 12/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 5972e492ec0b..c236755e0c9f 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 8b30aded8271..c26ee2892015 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/sources.xml b/b2g/config/emulator/sources.xml index 5972e492ec0b..c236755e0c9f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index d3f6e45d9cef..893c79bcb05e 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 75eb670c9adf..fa19414e9cab 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 25bec2c23493..a44260b33aac 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index eef43c3633b4..cac68063015c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2049dd489aa5..c35eb524fbfb 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 5c6339ab9429..de76f24cb0e1 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 743df76316640683c3a03c3b7746d96e605760cb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 15:55:23 -0800 Subject: [PATCH 13/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/25562480c0f6 Author: Ryan VanderMeulen Desc: Merge pull request #16917 from 6a68/bug-972645-reset-password Bug 972645 - Implement Reset Password Firefox Accounts flow, resubmitted. r=ferjm ======== https://hg.mozilla.org/integration/gaia-central/rev/9646e5b494aa Author: Jared Hirsch Desc: Bug 972645 - Implement Reset Password Firefox Accounts flow, resubmitted. r=ferjm Includes special case for reset password in FTE, see bug 965494 comment 1 --- 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 8577d39a0c55..a84f78b5c928 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "c10a5f7f7e2f804ce91ce1a4ebb83811788220fe", + "revision": "25562480c0f615efc6d2a80b56cdba5c4cf6b1a9", "repo_path": "/integration/gaia-central" } From ae1ac771e2c2127c35a9c9e12e97ee2cd258a3d6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 16:01:12 -0800 Subject: [PATCH 14/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 c236755e0c9f..005f054432a7 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 c26ee2892015..ebc6a7e020ca 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/sources.xml b/b2g/config/emulator/sources.xml index c236755e0c9f..005f054432a7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 893c79bcb05e..8edd5970b87e 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 fa19414e9cab..637d3ba144e8 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a44260b33aac..f0bf9215fbc5 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index cac68063015c..1aa5634a4afb 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index c35eb524fbfb..548905cfc238 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index de76f24cb0e1..85c629ab92b0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e3b446823483c0e5e39685a56869f17c317e0b47 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 16:41:23 -0800 Subject: [PATCH 15/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 005f054432a7..e6cc09ded691 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -97,7 +97,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 005f054432a7..e6cc09ded691 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -97,7 +97,7 @@ - + From eb8850688443ab8f4ad6103d66d4aa5c805cf68a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 17:56:28 -0800 Subject: [PATCH 16/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 4 ++-- b2g/config/mako/sources.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ebc6a7e020ca..daef4a72af60 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,8 +21,8 @@ - - + + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 548905cfc238..bece119b1140 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -21,8 +21,8 @@ - - + + From 9c9e49ec753965eeca6d80b04793684f20c74c17 Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Fri, 28 Feb 2014 12:02:55 -0800 Subject: [PATCH 17/22] Bug 977372 - Close IPC'd filedescriptor from device descriptor when finished with it. r=mikeh --- dom/camera/DOMCameraControl.cpp | 10 +++++++++- dom/camera/GonkCameraControl.cpp | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp index 6f56a4e6f367..15ef138bc09b 100644 --- a/dom/camera/DOMCameraControl.cpp +++ b/dom/camera/DOMCameraControl.cpp @@ -11,6 +11,7 @@ #include "DeviceStorage.h" #include "DeviceStorageFileDescriptor.h" #include "mozilla/dom/TabChild.h" +#include "mozilla/ipc/FileDescriptorUtils.h" #include "mozilla/MediaManager.h" #include "mozilla/Services.h" #include "mozilla/unused.h" @@ -34,6 +35,7 @@ using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::idl; +using namespace mozilla::ipc; NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMCameraControl) NS_INTERFACE_MAP_ENTRY(nsISupports) @@ -728,8 +730,14 @@ nsDOMCameraControl::OnCreatedFileDescriptor(bool aSucceeded) return; } } - OnError(CameraControlListener::kInStartRecording, NS_LITERAL_STRING("FAILURE")); + + // An error occured. We need to manually close the file associated with the + // FileDescriptor, and we shouldn't do this on the main thread, so we + // use a little helper. + nsRefPtr closer = + new CloseFileRunnable(mDSFileDescriptor->mFileDescriptor); + closer->Dispatch(); } void diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp index 61c738d55d8c..e744970d0aee 100644 --- a/dom/camera/GonkCameraControl.cpp +++ b/dom/camera/GonkCameraControl.cpp @@ -30,6 +30,7 @@ #include "mozilla/FileUtils.h" #include "mozilla/Services.h" #include "mozilla/unused.h" +#include "mozilla/ipc/FileDescriptorUtils.h" #include "nsAlgorithm.h" #include #include "nsPrintfCString.h" @@ -46,6 +47,7 @@ using namespace mozilla; using namespace mozilla::layers; using namespace mozilla::gfx; +using namespace mozilla::ipc; using namespace android; #define RETURN_IF_NO_CAMERA_HW() \ @@ -855,6 +857,12 @@ nsGonkCameraControl::StartRecordingImpl(DeviceStorageFileDescriptor* aFileDescri return NS_ERROR_INVALID_ARG; } + // SetupRecording creates a dup of the file descriptor, so we need to + // close the file descriptor when we leave this function. Also note, that + // since we're already off the main thread, we don't need to dispatch this. + // We just let the CloseFileRunnable destructor do the work. + nsRefPtr closer = + new CloseFileRunnable(aFileDescriptor->mFileDescriptor); nsresult rv; int fd = aFileDescriptor->mFileDescriptor.PlatformHandle(); if (aOptions) { From df5638354e6f4c9f7222e0719905164d10348d7c Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Wed, 5 Mar 2014 20:18:06 -0800 Subject: [PATCH 18/22] Bug 977372 - Remove main thread assert so CloseFileRunnable can be used on non-main threads. r=bent --- ipc/glue/FileDescriptorUtils.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/ipc/glue/FileDescriptorUtils.cpp b/ipc/glue/FileDescriptorUtils.cpp index dbd390c6e356..0623ba151485 100644 --- a/ipc/glue/FileDescriptorUtils.cpp +++ b/ipc/glue/FileDescriptorUtils.cpp @@ -21,7 +21,6 @@ using mozilla::ipc::CloseFileRunnable; CloseFileRunnable::CloseFileRunnable(const FileDescriptor& aFileDescriptor) : mFileDescriptor(aFileDescriptor) { - MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(aFileDescriptor.IsValid()); } @@ -41,8 +40,6 @@ NS_IMPL_ISUPPORTS1(CloseFileRunnable, nsIRunnable) void CloseFileRunnable::Dispatch() { - MOZ_ASSERT(NS_IsMainThread()); - nsCOMPtr eventTarget = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID); NS_ENSURE_TRUE_VOID(eventTarget); From 0f4b869938e297336a5ce9305b6a0e46f63d5676 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 23:15:26 -0800 Subject: [PATCH 19/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/67e75b4310bc Author: EragonJ Desc: Merge pull request #16896 from EragonJ/bug-979771 Bug 979771 - [DSDS] Data call icon on Utility Tray will not become blue ======== https://hg.mozilla.org/integration/gaia-central/rev/e71c4fe284bc Author: EragonJ Desc: Bug 979771 - [DSDS] Data call icon on Utility Tray will not become blue - we would iterate mozMobileConnections now - update unit tests - refactor code --- 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 a84f78b5c928..267ff77b1c8e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "25562480c0f615efc6d2a80b56cdba5c4cf6b1a9", + "revision": "67e75b4310bc04e26b0e065aa16b71a21b456705", "repo_path": "/integration/gaia-central" } From e846006c1a4eda555b44b490ac217dbc3521b5f1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Mar 2014 23:20:52 -0800 Subject: [PATCH 20/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/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 e6cc09ded691..d3e1cbd4123f 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 daef4a72af60..8df00c73d1fb 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/sources.xml b/b2g/config/emulator/sources.xml index e6cc09ded691..d3e1cbd4123f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8edd5970b87e..484f02277bd1 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 637d3ba144e8..c5965a33009b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index f0bf9215fbc5..12aa146cb89a 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 1aa5634a4afb..ee4ffb5f9b1f 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index bece119b1140..0e71f532ab9a 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 85c629ab92b0..319fbc0d36ae 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 34af5d34eca752d4e8144c419c62351053700da3 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Thu, 6 Mar 2014 09:16:01 +0100 Subject: [PATCH 21/22] Backed out changeset 1314168b5271 (bug 977372) --- ipc/glue/FileDescriptorUtils.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ipc/glue/FileDescriptorUtils.cpp b/ipc/glue/FileDescriptorUtils.cpp index 0623ba151485..dbd390c6e356 100644 --- a/ipc/glue/FileDescriptorUtils.cpp +++ b/ipc/glue/FileDescriptorUtils.cpp @@ -21,6 +21,7 @@ using mozilla::ipc::CloseFileRunnable; CloseFileRunnable::CloseFileRunnable(const FileDescriptor& aFileDescriptor) : mFileDescriptor(aFileDescriptor) { + MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(aFileDescriptor.IsValid()); } @@ -40,6 +41,8 @@ NS_IMPL_ISUPPORTS1(CloseFileRunnable, nsIRunnable) void CloseFileRunnable::Dispatch() { + MOZ_ASSERT(NS_IsMainThread()); + nsCOMPtr eventTarget = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID); NS_ENSURE_TRUE_VOID(eventTarget); From 55bbe0a399b83d78c1f887fa812067ecdf27716c Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Thu, 6 Mar 2014 09:16:43 +0100 Subject: [PATCH 22/22] Backed out changeset 4fb349c12a63 (bug 977372) for b2g ics emulator debug m8 test failure --- dom/camera/DOMCameraControl.cpp | 10 +--------- dom/camera/GonkCameraControl.cpp | 8 -------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp index 15ef138bc09b..6f56a4e6f367 100644 --- a/dom/camera/DOMCameraControl.cpp +++ b/dom/camera/DOMCameraControl.cpp @@ -11,7 +11,6 @@ #include "DeviceStorage.h" #include "DeviceStorageFileDescriptor.h" #include "mozilla/dom/TabChild.h" -#include "mozilla/ipc/FileDescriptorUtils.h" #include "mozilla/MediaManager.h" #include "mozilla/Services.h" #include "mozilla/unused.h" @@ -35,7 +34,6 @@ using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::idl; -using namespace mozilla::ipc; NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMCameraControl) NS_INTERFACE_MAP_ENTRY(nsISupports) @@ -730,14 +728,8 @@ nsDOMCameraControl::OnCreatedFileDescriptor(bool aSucceeded) return; } } - OnError(CameraControlListener::kInStartRecording, NS_LITERAL_STRING("FAILURE")); - // An error occured. We need to manually close the file associated with the - // FileDescriptor, and we shouldn't do this on the main thread, so we - // use a little helper. - nsRefPtr closer = - new CloseFileRunnable(mDSFileDescriptor->mFileDescriptor); - closer->Dispatch(); + OnError(CameraControlListener::kInStartRecording, NS_LITERAL_STRING("FAILURE")); } void diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp index e744970d0aee..61c738d55d8c 100644 --- a/dom/camera/GonkCameraControl.cpp +++ b/dom/camera/GonkCameraControl.cpp @@ -30,7 +30,6 @@ #include "mozilla/FileUtils.h" #include "mozilla/Services.h" #include "mozilla/unused.h" -#include "mozilla/ipc/FileDescriptorUtils.h" #include "nsAlgorithm.h" #include #include "nsPrintfCString.h" @@ -47,7 +46,6 @@ using namespace mozilla; using namespace mozilla::layers; using namespace mozilla::gfx; -using namespace mozilla::ipc; using namespace android; #define RETURN_IF_NO_CAMERA_HW() \ @@ -857,12 +855,6 @@ nsGonkCameraControl::StartRecordingImpl(DeviceStorageFileDescriptor* aFileDescri return NS_ERROR_INVALID_ARG; } - // SetupRecording creates a dup of the file descriptor, so we need to - // close the file descriptor when we leave this function. Also note, that - // since we're already off the main thread, we don't need to dispatch this. - // We just let the CloseFileRunnable destructor do the work. - nsRefPtr closer = - new CloseFileRunnable(aFileDescriptor->mFileDescriptor); nsresult rv; int fd = aFileDescriptor->mFileDescriptor.PlatformHandle(); if (aOptions) {