From c5eacf2136740af605a548046255f232fd7d9b4d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 1 Sep 2015 20:25:21 -0700 Subject: [PATCH 01/32] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ac2c9e534261 Author: gasolin Desc: Merge pull request #31506 from gasolin/issue-1197711 Bug 1197711 - make BTHelper.getConnectedDevicesByProfile available for APIv2, r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/a1e97ae054b5 Author: gasolin Desc: Bug 1197711 - make BTHelper.getConnectedDevicesByProfile available for APIv2, r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/93fed5238dfb Author: Kevin Grandon Desc: Merge pull request #31645 from KevinGrandon/bug_1199838_download_checkbox_margin Bug 1199838 - [Downloads] Add additional padding to download checkboxes to match the rest of the settings app ======== https://hg.mozilla.org/integration/gaia-central/rev/abafaa147a9c Author: Kevin Grandon Desc: Bug 1199838 - [Downloads] Add additional padding to download checkboxes to match the rest of the settings app --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8defd6bf37bd..6cc18895dc8f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "e2fab8f6ac345ecde10a1350e699be9ceb6987d6", + "git_revision": "e9d7c4e3ede5ca1559d7375ac78a7f97d40dc414", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1ab9e5d9915dc22fed71384a53dc565bce1709aa", + "revision": "ac2c9e534261f65a446278ca98eacce2e819df53", "repo_path": "integration/gaia-central" } From 63deda7af9382669fd92d72d3e94915b53a8cee1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 1 Sep 2015 20:28:04 -0700 Subject: [PATCH 02/32] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index b2cffea640b7..9c2db3231007 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index fdaa49b25251..29bcdcc09a53 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index da686093ce15..88a97447450d 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 61ee108f0122..7b959ec28b31 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 afcd6eefbbd2..42d9fd64522c 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index 63b02424630c..d96c6ca3308e 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index da686093ce15..88a97447450d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 9ddd7d0eb1d9..62746759cd72 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 85f8e50b7cfe..b010bf24ef5c 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 5d576f09fe88..8732e1da5167 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 0b610e0082103c3975c65a6baefb413b39e989f8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Sep 2015 01:09:53 -0700 Subject: [PATCH 03/32] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 9c2db3231007..11b1e71d6908 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 29bcdcc09a53..cdaf30e2c9ea 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 7b959ec28b31..c4f07df207ad 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 42d9fd64522c..2ef66eab99b3 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index d96c6ca3308e..53b7b9015fd7 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 62746759cd72..0fc8324ca667 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b010bf24ef5c..bcd2e4c20644 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 8732e1da5167..ecd9ad8cfa0b 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -23,7 +23,7 @@ - + From 655e444b3bf4c041b81670d511ac76b0925ee725 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Sep 2015 01:20:19 -0700 Subject: [PATCH 04/32] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7bd67f5eb25d Author: Ricky Chien Desc: Merge pull request #31629 from rickychien/issue-1179410 Bug 1179410 - Screen Lock shows passcode status on subtitle r=@gasolin ======== https://hg.mozilla.org/integration/gaia-central/rev/5f3bc640831d Author: Ricky Chien Desc: Bug 1179410 - Screen Lock shows passcode status on subtitle --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6cc18895dc8f..42b321c9d6a1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "e9d7c4e3ede5ca1559d7375ac78a7f97d40dc414", + "git_revision": "12e4a642fa949ca17646ce4db56394b131c49fb8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "ac2c9e534261f65a446278ca98eacce2e819df53", + "revision": "7bd67f5eb25dce32f60ebfa733f870ddfc4ab894", "repo_path": "integration/gaia-central" } From a2294df4d26b4454330fb423340efdbea7ca815f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Sep 2015 01:23:01 -0700 Subject: [PATCH 05/32] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 11b1e71d6908..fd402e8e96d6 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index cdaf30e2c9ea..abd5b3ec9f92 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 88a97447450d..54acfa65a043 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 c4f07df207ad..1288bdbb4a58 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 2ef66eab99b3..78379995e2ce 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index 53b7b9015fd7..244430de67af 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 88a97447450d..54acfa65a043 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 0fc8324ca667..538171f8e049 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index bcd2e4c20644..ef8ac5b4df31 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index ecd9ad8cfa0b..35b55748314f 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 37ec491a23691b7ac559c88413590f17469f0988 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Sep 2015 03:00:29 -0700 Subject: [PATCH 06/32] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/63361902dab2 Author: Fernando Jiménez Moreno Desc: Merge pull request #31570 from ferjm/bug1198180.favoritecontacts Bug 1198180 - [Contacts]The 'Add as Favorite' option in Contacts app … ======== https://hg.mozilla.org/integration/gaia-central/rev/92c2b7cdc34a Author: Fernando Jiménez Moreno Desc: Bug 1198180 - [Contacts]The 'Add as Favorite' option in Contacts app cannot work after user taps it more than twice. r=borjasalguero --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 42b321c9d6a1..57ff48526c08 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "12e4a642fa949ca17646ce4db56394b131c49fb8", + "git_revision": "df646da1c97c2b927db227867fca8272837319fc", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7bd67f5eb25dce32f60ebfa733f870ddfc4ab894", + "revision": "63361902dab285db3f251999ef0692244705a370", "repo_path": "integration/gaia-central" } From a8cc2f3604a032d4fc2af907a3d4ec5830e7b836 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Sep 2015 03:03:13 -0700 Subject: [PATCH 07/32] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index fd402e8e96d6..9e54a387ca2e 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index abd5b3ec9f92..cd09b95faf36 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 54acfa65a043..c0218ef03e34 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 1288bdbb4a58..f5d074b7c334 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 78379995e2ce..b29fb4e695b6 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-l/sources.xml b/b2g/config/emulator-l/sources.xml index 244430de67af..a370d2340459 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 54acfa65a043..c0218ef03e34 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 538171f8e049..5c9adeb6f77d 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ef8ac5b4df31..4e7aa62b8b45 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 35b55748314f..2732a16c8870 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 98d994acf1e1cf6569794528dfc7ac7612c97c6a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 2 Sep 2015 03:46:01 -0700 Subject: [PATCH 08/32] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 9e54a387ca2e..a8d1fa3430bd 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -110,7 +110,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index cd09b95faf36..74772aef61f7 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -115,7 +115,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index f5d074b7c334..0da2a7f2d66d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -118,7 +118,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b29fb4e695b6..8a9aab1d35cc 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -115,7 +115,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index a370d2340459..1dfc8b6ce2c0 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -126,7 +126,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 5c9adeb6f77d..72c76bc8f0ac 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -109,7 +109,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 4e7aa62b8b45..4f3dc1f3a4ba 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -118,7 +118,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 2732a16c8870..e81220792738 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -126,7 +126,7 @@ - + From e0885aabed278013df9120148b2208a250d0d48a Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Wed, 2 Sep 2015 09:37:17 -0300 Subject: [PATCH 09/32] Bug 1197008 - Stop assuming 0 is an invalid threadId. r=btseng r=hsinyi --- dom/mobilemessage/MobileMessageManager.cpp | 5 +++-- dom/mobilemessage/android/MobileMessageDatabaseService.cpp | 1 + dom/mobilemessage/gonk/MobileMessageDB.jsm | 7 ++++--- dom/mobilemessage/gonk/MobileMessageDatabaseService.js | 7 ++++--- .../interfaces/nsIMobileMessageDatabaseService.idl | 3 ++- dom/mobilemessage/ipc/SmsIPCService.cpp | 2 ++ dom/mobilemessage/ipc/SmsParent.cpp | 1 + dom/mobilemessage/ipc/SmsTypes.ipdlh | 1 + dom/mobilemessage/tests/marionette/mmdb_head.js | 1 + dom/webidl/MozMobileMessageManager.webidl | 2 +- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dom/mobilemessage/MobileMessageManager.cpp b/dom/mobilemessage/MobileMessageManager.cpp index 833ee9d56a37..7a8d1df9878e 100644 --- a/dom/mobilemessage/MobileMessageManager.cpp +++ b/dom/mobilemessage/MobileMessageManager.cpp @@ -463,8 +463,9 @@ MobileMessageManager::GetMessages(const MobileMessageFilter& aFilter, read = aFilter.mRead.Value(); } + bool hasThreadId = !aFilter.mThreadId.IsNull(); uint64_t threadId = 0; - if (!aFilter.mThreadId.IsNull()) { + if (hasThreadId) { threadId = aFilter.mThreadId.Value(); } @@ -476,7 +477,7 @@ MobileMessageManager::GetMessages(const MobileMessageFilter& aFilter, ptrNumbers, numbersCount, delivery, hasRead, read, - threadId, + hasThreadId, threadId, aReverse, cursorCallback, getter_AddRefs(continueCallback)); if (NS_FAILED(rv)) { diff --git a/dom/mobilemessage/android/MobileMessageDatabaseService.cpp b/dom/mobilemessage/android/MobileMessageDatabaseService.cpp index 1680bb17ce90..aac5f680e69d 100644 --- a/dom/mobilemessage/android/MobileMessageDatabaseService.cpp +++ b/dom/mobilemessage/android/MobileMessageDatabaseService.cpp @@ -56,6 +56,7 @@ MobileMessageDatabaseService::CreateMessageCursor(bool aHasStartDate, const nsAString& aDelivery, bool aHasRead, bool aRead, + bool aHasThreadId, uint64_t aThreadId, bool aReverse, nsIMobileMessageCursorCallback* aCallback, diff --git a/dom/mobilemessage/gonk/MobileMessageDB.jsm b/dom/mobilemessage/gonk/MobileMessageDB.jsm index ccf2d3fb1eba..bfb90a44eec9 100644 --- a/dom/mobilemessage/gonk/MobileMessageDB.jsm +++ b/dom/mobilemessage/gonk/MobileMessageDB.jsm @@ -4045,7 +4045,8 @@ MobileMessageDB.prototype = { */ createMessageCursor: function(aHasStartDate, aStartDate, aHasEndDate, aEndDate, aNumbers, aNumbersCount, aDelivery, - aHasRead, aRead, aThreadId, aReverse, aCallback) { + aHasRead, aRead, aHasThreadId, aThreadId, + aReverse, aCallback) { if (DEBUG) { debug("Creating a message cursor. Filters:" + " startDate: " + (aHasStartDate ? aStartDate : "(null)") + @@ -4053,7 +4054,7 @@ MobileMessageDB.prototype = { " delivery: " + aDelivery + " numbers: " + (aNumbersCount ? aNumbers : "(null)") + " read: " + (aHasRead ? aRead : "(null)") + - " threadId: " + aThreadId + + " threadId: " + (aHasThreadId ? aThreadId : "(null)") + " reverse: " + aReverse); } @@ -4073,7 +4074,7 @@ MobileMessageDB.prototype = { if (aHasRead) { filter.read = aRead; } - if (aThreadId) { + if (aHasThreadId) { filter.threadId = aThreadId; } diff --git a/dom/mobilemessage/gonk/MobileMessageDatabaseService.js b/dom/mobilemessage/gonk/MobileMessageDatabaseService.js index 9ca19e57de62..a88cdb747e78 100644 --- a/dom/mobilemessage/gonk/MobileMessageDatabaseService.js +++ b/dom/mobilemessage/gonk/MobileMessageDatabaseService.js @@ -110,11 +110,12 @@ MobileMessageDatabaseService.prototype = { createMessageCursor: function(aHasStartDate, aStartDate, aHasEndDate, aEndDate, aNumbers, aNumbersCount, aDelivery, - aHasRead, aRead, aThreadId, aReverse, aCallback) { + aHasRead, aRead, aHasThreadId, aThreadId, + aReverse, aCallback) { return this.mmdb.createMessageCursor(aHasStartDate, aStartDate, aHasEndDate, aEndDate, aNumbers, aNumbersCount, - aDelivery, aHasRead, aRead, aThreadId, - aReverse, aCallback); + aDelivery, aHasRead, aRead, aHasThreadId, + aThreadId, aReverse, aCallback); }, markMessageRead: function(aMessageId, aValue, aSendReadReport, aRequest) { diff --git a/dom/mobilemessage/interfaces/nsIMobileMessageDatabaseService.idl b/dom/mobilemessage/interfaces/nsIMobileMessageDatabaseService.idl index ff78aa39892e..1656faeeca04 100644 --- a/dom/mobilemessage/interfaces/nsIMobileMessageDatabaseService.idl +++ b/dom/mobilemessage/interfaces/nsIMobileMessageDatabaseService.idl @@ -15,7 +15,7 @@ interface nsICursorContinueCallback; interface nsIMobileMessageCallback; interface nsIMobileMessageCursorCallback; -[scriptable, uuid(ead626bc-f5b4-47e1-921c-0b956c9298e0)] +[scriptable, uuid(18672be2-c185-4f9c-8af6-2e6ea004de73)] interface nsIMobileMessageDatabaseService : nsISupports { [binaryname(GetMessageMoz)] @@ -35,6 +35,7 @@ interface nsIMobileMessageDatabaseService : nsISupports [Null(Null), Undefined(Null)] in DOMString delivery, in boolean hasRead, in boolean read, + in boolean hasThreadId, in unsigned long long threadId, in boolean reverse, in nsIMobileMessageCursorCallback callback); diff --git a/dom/mobilemessage/ipc/SmsIPCService.cpp b/dom/mobilemessage/ipc/SmsIPCService.cpp index 1465e83dd4cb..9cd39ea75654 100644 --- a/dom/mobilemessage/ipc/SmsIPCService.cpp +++ b/dom/mobilemessage/ipc/SmsIPCService.cpp @@ -260,6 +260,7 @@ SmsIPCService::CreateMessageCursor(bool aHasStartDate, const nsAString& aDelivery, bool aHasRead, bool aRead, + bool aHasThreadId, uint64_t aThreadId, bool aReverse, nsIMobileMessageCursorCallback* aCursorCallback, @@ -284,6 +285,7 @@ SmsIPCService::CreateMessageCursor(bool aHasStartDate, data.delivery() = aDelivery; data.hasRead() = aHasRead; data.read() = aRead; + data.hasThreadId() = aHasThreadId; data.threadId() = aThreadId; return SendCursorRequest(CreateMessageCursorRequest(data, aReverse), diff --git a/dom/mobilemessage/ipc/SmsParent.cpp b/dom/mobilemessage/ipc/SmsParent.cpp index 0cecf52adefa..f98c1d27e8db 100644 --- a/dom/mobilemessage/ipc/SmsParent.cpp +++ b/dom/mobilemessage/ipc/SmsParent.cpp @@ -847,6 +847,7 @@ MobileMessageCursorParent::DoRequest(const CreateMessageCursorRequest& aRequest) filter.delivery(), filter.hasRead(), filter.read(), + filter.hasThreadId(), filter.threadId(), aRequest.reverse(), this, diff --git a/dom/mobilemessage/ipc/SmsTypes.ipdlh b/dom/mobilemessage/ipc/SmsTypes.ipdlh index 3ec0ed0a6551..120e47caa022 100644 --- a/dom/mobilemessage/ipc/SmsTypes.ipdlh +++ b/dom/mobilemessage/ipc/SmsTypes.ipdlh @@ -85,6 +85,7 @@ struct SmsFilterData nsString delivery; bool hasRead; bool read; + bool hasThreadId; uint64_t threadId; }; diff --git a/dom/mobilemessage/tests/marionette/mmdb_head.js b/dom/mobilemessage/tests/marionette/mmdb_head.js index cc77643174a1..7ea807886d87 100644 --- a/dom/mobilemessage/tests/marionette/mmdb_head.js +++ b/dom/mobilemessage/tests/marionette/mmdb_head.js @@ -341,6 +341,7 @@ function createMessageCursor(aMmdb, aStartDate = null, aEndDate = null, aDelivery || null, aRead !== null, aRead || false, + aThreadId !== null, aThreadId || 0, aReverse || false); } diff --git a/dom/webidl/MozMobileMessageManager.webidl b/dom/webidl/MozMobileMessageManager.webidl index fbde0861e82f..2638b7f5b1b4 100644 --- a/dom/webidl/MozMobileMessageManager.webidl +++ b/dom/webidl/MozMobileMessageManager.webidl @@ -72,7 +72,7 @@ dictionary MobileMessageFilter boolean? read = null; // Filtering by a message's threadId attribute. - [EnforceRange] unsigned long long? threadId = 0; + [EnforceRange] unsigned long long? threadId = null; }; /** From e610a0254c7aa6aeca85417f498f0f56a2124db5 Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Fri, 31 Jul 2015 15:55:28 +0800 Subject: [PATCH 10/32] Bug 1189315 - Add daemon interface for HFP WBS callback. r=tzimmermann --HG-- extra : rebase_source : b47a3bc53aacedec82859d44a9fcedfd069e5bd4 --- .../BluetoothDaemonHandsfreeInterface.cpp | 44 ++++++++++++++++++- .../BluetoothDaemonHandsfreeInterface.h | 9 ++++ .../bluedroid/BluetoothDaemonHelpers.cpp | 7 +++ .../bluedroid/BluetoothDaemonHelpers.h | 3 ++ 4 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp b/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp index 67ef9ff39dae..2a810c41de9e 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp +++ b/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp @@ -1419,6 +1419,47 @@ BluetoothDaemonHandsfreeModule::KeyPressedNtf( KeyPressedInitOp(aPDU)); } +// Init operator class for WbsNotification +class BluetoothDaemonHandsfreeModule::WbsInitOp final + : private PDUInitOp +{ +public: + WbsInitOp(DaemonSocketPDU& aPDU) + : PDUInitOp(aPDU) + { } + + nsresult + operator () (BluetoothHandsfreeWbsConfig& aArg1, nsString& aArg2) const + { + DaemonSocketPDU& pdu = GetPDU(); + + /* Read state */ + nsresult rv = UnpackPDU(pdu, aArg1); + if (NS_FAILED(rv)) { + return rv; + } + + /* Read address */ + rv = UnpackPDU( + pdu, UnpackConversion(aArg2)); + if (NS_FAILED(rv)) { + return rv; + } + + WarnAboutTrailingData(); + return NS_OK; + } +}; + +void +BluetoothDaemonHandsfreeModule::WbsNtf( + const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU) +{ + WbsNotification::Dispatch( + &BluetoothHandsfreeNotificationHandler::WbsNotification, + WbsInitOp(aPDU)); +} + void BluetoothDaemonHandsfreeModule::HandleNtf( const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU, @@ -1441,7 +1482,8 @@ BluetoothDaemonHandsfreeModule::HandleNtf( [12] = &BluetoothDaemonHandsfreeModule::CopsNtf, [13] = &BluetoothDaemonHandsfreeModule::ClccNtf, [14] = &BluetoothDaemonHandsfreeModule::UnknownAtNtf, - [15] = &BluetoothDaemonHandsfreeModule::KeyPressedNtf + [15] = &BluetoothDaemonHandsfreeModule::KeyPressedNtf, + [16] = &BluetoothDaemonHandsfreeModule::WbsNtf }; MOZ_ASSERT(!NS_IsMainThread()); diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h index 02329f710155..3e9ea48969eb 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h +++ b/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h @@ -292,6 +292,11 @@ protected: NotificationHandlerWrapper, void, nsString, const nsAString&> KeyPressedNotification; + typedef mozilla::ipc::DaemonNotificationRunnable2< + NotificationHandlerWrapper, void, BluetoothHandsfreeWbsConfig, nsString, + BluetoothHandsfreeWbsConfig, const nsAString&> + WbsNotification; + class ConnectionStateInitOp; class AudioStateInitOp; class VoiceRecognitionInitOp; @@ -309,6 +314,7 @@ protected: class VolumeInitOp; class UnknownAtInitOp; class KeyPressedInitOp; + class WbsInitOp; void ConnectionStateNtf(const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU); @@ -358,6 +364,9 @@ protected: void KeyPressedNtf(const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU); + void WbsNtf(const DaemonSocketPDUHeader& aHeader, + DaemonSocketPDU& aPDU); + void HandleNtf(const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU, void* aUserData); diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp index af3a291c047f..af198a40af2c 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp +++ b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.cpp @@ -1467,6 +1467,13 @@ UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeNRECState& aOut) aPDU, UnpackConversion(aOut)); } +nsresult +UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeWbsConfig& aOut) +{ + return UnpackPDU( + aPDU, UnpackConversion(aOut)); +} + nsresult UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeVoiceRecognitionState& aOut) diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h index 6baa2334d73c..baa7e6a7f54d 100644 --- a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h +++ b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h @@ -848,6 +848,9 @@ UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeConnectionState& aOut); nsresult UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeNRECState& aOut); +nsresult +UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeWbsConfig& aOut); + nsresult UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeVoiceRecognitionState& aOut); From 2cc499056ec6c11be5c49e2b2b76576cbab2289c Mon Sep 17 00:00:00 2001 From: Ricky Chien Date: Fri, 28 Aug 2015 00:44:00 -0400 Subject: [PATCH 11/32] Bug 1196595 - Add gtk3.tar.xz in emulator. r=glandium --HG-- extra : rebase_source : 59fe82e4a2edcac20a89451892362d6c5b5b1afd --- b2g/config/emulator-ics/releng-emulator-ics.tt | 7 +++++++ b2g/config/emulator-jb/releng-emulator-jb.tt | 7 +++++++ b2g/config/emulator-kk/releng-emulator-kk.tt | 7 +++++++ b2g/config/emulator-l/releng-emulator-l.tt | 7 +++++++ b2g/config/emulator-x86-kk/releng-emulator-kk.tt | 7 +++++++ b2g/config/emulator-x86-l/releng-emulator-l.tt | 7 +++++++ b2g/config/emulator/releng-emulator.tt | 7 +++++++ 7 files changed, 49 insertions(+) diff --git a/b2g/config/emulator-ics/releng-emulator-ics.tt b/b2g/config/emulator-ics/releng-emulator-ics.tt index 1af12208b9da..7382bad5b892 100644 --- a/b2g/config/emulator-ics/releng-emulator-ics.tt +++ b/b2g/config/emulator-ics/releng-emulator-ics.tt @@ -5,5 +5,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": "True" +}, +{ +"size": 12057960, +"digest": 6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] diff --git a/b2g/config/emulator-jb/releng-emulator-jb.tt b/b2g/config/emulator-jb/releng-emulator-jb.tt index 1af12208b9da..7382bad5b892 100644 --- a/b2g/config/emulator-jb/releng-emulator-jb.tt +++ b/b2g/config/emulator-jb/releng-emulator-jb.tt @@ -5,5 +5,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": "True" +}, +{ +"size": 12057960, +"digest": 6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] diff --git a/b2g/config/emulator-kk/releng-emulator-kk.tt b/b2g/config/emulator-kk/releng-emulator-kk.tt index 1af12208b9da..7382bad5b892 100644 --- a/b2g/config/emulator-kk/releng-emulator-kk.tt +++ b/b2g/config/emulator-kk/releng-emulator-kk.tt @@ -5,5 +5,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": "True" +}, +{ +"size": 12057960, +"digest": 6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] diff --git a/b2g/config/emulator-l/releng-emulator-l.tt b/b2g/config/emulator-l/releng-emulator-l.tt index 1af12208b9da..7382bad5b892 100644 --- a/b2g/config/emulator-l/releng-emulator-l.tt +++ b/b2g/config/emulator-l/releng-emulator-l.tt @@ -5,5 +5,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": "True" +}, +{ +"size": 12057960, +"digest": 6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] diff --git a/b2g/config/emulator-x86-kk/releng-emulator-kk.tt b/b2g/config/emulator-x86-kk/releng-emulator-kk.tt index 1af12208b9da..7382bad5b892 100644 --- a/b2g/config/emulator-x86-kk/releng-emulator-kk.tt +++ b/b2g/config/emulator-x86-kk/releng-emulator-kk.tt @@ -5,5 +5,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": "True" +}, +{ +"size": 12057960, +"digest": 6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] diff --git a/b2g/config/emulator-x86-l/releng-emulator-l.tt b/b2g/config/emulator-x86-l/releng-emulator-l.tt index 1af12208b9da..7382bad5b892 100644 --- a/b2g/config/emulator-x86-l/releng-emulator-l.tt +++ b/b2g/config/emulator-x86-l/releng-emulator-l.tt @@ -5,5 +5,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": "True" +}, +{ +"size": 12057960, +"digest": 6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] diff --git a/b2g/config/emulator/releng-emulator.tt b/b2g/config/emulator/releng-emulator.tt index 1af12208b9da..55f67c82c1fe 100644 --- a/b2g/config/emulator/releng-emulator.tt +++ b/b2g/config/emulator/releng-emulator.tt @@ -5,5 +5,12 @@ "algorithm": "sha512", "filename": "gcc.tar.xz", "unpack": "True" +}, +{ +"size": 12057960, +"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"algorithm": "sha512", +"filename": "gtk3.tar.xz", +"unpack": true } ] From dc7018f157fe5f685f5df0a5f56d6dd763df4ea9 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Tue, 25 Aug 2015 18:35:17 +0800 Subject: [PATCH 12/32] Bug 1178856 - Create an API for detecting web-extensions support on b2g. r=fabrice --HG-- extra : rebase_source : 64c0ea6309accca79fae2c6b8c1ab880659918d2 --- dom/base/Navigator.cpp | 8 +++++ dom/base/test/test_hasFeature.html | 51 +++++++++++++++++++----------- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 8dadd511fd47..b32e22a1fae4 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1598,6 +1598,14 @@ Navigator::HasFeature(const nsAString& aName, ErrorResult& aRv) return nullptr; } + // Hardcoded web-extensions feature which is b2g specific. +#ifdef MOZ_B2G + if (aName.EqualsLiteral("web-extensions")) { + p->MaybeResolve(true); + return p.forget(); + } +#endif + // Hardcoded manifest features. Some are still b2g specific. const char manifestFeatures[][64] = { "manifest.origin" diff --git a/dom/base/test/test_hasFeature.html b/dom/base/test/test_hasFeature.html index 3dc7eb9a2a33..7be3eb604937 100644 --- a/dom/base/test/test_hasFeature.html +++ b/dom/base/test/test_hasFeature.html @@ -13,22 +13,17 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1009645 Mozilla Bug 1009645