From 27abceb0ecc9f971afa3b1616faf50414a93f53b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 24 May 2015 22:05:28 -0700 Subject: [PATCH 01/25] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a582a6b7a583 Author: autolander Desc: Bug 1167117 - merge pull request #30218 from huchengtw-moz:bug-1167117-update-smart-modal-dialog to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/64e11cf73a12 Author: John Hu Desc: Bug 1167117 - [building block] update smart-system to have latest smart modal dialog --- 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 ea0e5c4a505..f77ba6022f0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "5bcc08a732163087999251b523e3643db397412c", + "git_revision": "5dc3c3db26af23ed7aa02edb0f3fa2d3ffe38c4c", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "66ad152ea50938f799bf7edd4bc2088f47b85c00", + "revision": "a582a6b7a583abd86a36d97983071d0915648cf9", "repo_path": "integration/gaia-central" } From e10d09c80357c82731f56fa244aabcc122c06310 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 24 May 2015 22:07:22 -0700 Subject: [PATCH 02/25] 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 9f9a6391bb4..f7a454d3d75 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 b5452a3b9f0..ff7b7367cd5 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 53194b9e19c..13e44ed6591 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 1c6c519db68..1ee8543fde9 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 b639a383e8b..804c0bbe611 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 02b0b922ee5..e79f93671ba 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 53194b9e19c..13e44ed6591 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 8b21180e3b5..12c98c0041c 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 0ace2017853..6b3c95343e3 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 50d1c80a473..c43834920b9 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 95dd0acec76d41a31f88cfd8b91ed595baa3e11b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 00:01:27 -0700 Subject: [PATCH 03/25] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e701c654a55b Author: Ian Liu Desc: Merge pull request #30190 from ian-liu/bluetooth/bug1166636_remove_paired_device_from_found_device_list_while_inline_pairing_via_bluetooth_app Bug 1166636 - remove device paired from found device list of background app while it is paired via the foreground Bluetooth/Settings app ======== https://hg.mozilla.org/integration/gaia-central/rev/7f046514354f Author: ian-liu Desc: Bug 1166636 - remove device paired from found device list of background app while it is paired via the foreground Bluetooth/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 f77ba6022f0..95cdf6bc33c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "5dc3c3db26af23ed7aa02edb0f3fa2d3ffe38c4c", + "git_revision": "348f579664428ed95e949d8d4baf13b7a0ba13d8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a582a6b7a583abd86a36d97983071d0915648cf9", + "revision": "e701c654a55bac62499f41759e68fc8bdb2ad6c5", "repo_path": "integration/gaia-central" } From e5a5eba239df1282f0b1796703448f7b25dd2513 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 00:03:23 -0700 Subject: [PATCH 04/25] 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 f7a454d3d75..e87644cc842 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 ff7b7367cd5..f316f282190 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 13e44ed6591..f025a885dc1 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 1ee8543fde9..9948d1d2b8e 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 804c0bbe611..2cbc702d725 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 e79f93671ba..a0728f60ded 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 13e44ed6591..f025a885dc1 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 12c98c0041c..19fe2f743af 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 6b3c95343e3..e179d5fc350 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 c43834920b9..adf3ccc019c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From d5969abf2b442d3e87b2f185d274d3b4c1536f98 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 01:06:26 -0700 Subject: [PATCH 05/25] 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/47f559f1c21f Author: Rudy Lu Desc: Merge pull request #30174 from mantaroh/master Bug 1167050 - Remove container hidden code when choose datetime/datet… r=rudylu ======== https://hg.mozilla.org/integration/gaia-central/rev/52c70b3ef385 Author: Mantaroh Yoshinaga Desc: Bug 1167050 - Remove container hidden code when choose datetime/datetime-local picker. r=alive --- 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 95cdf6bc33c..920e57a7608 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "348f579664428ed95e949d8d4baf13b7a0ba13d8", + "git_revision": "3f38f429cfd5d1260362d7fb3fbf52576bbec83b", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "e701c654a55bac62499f41759e68fc8bdb2ad6c5", + "revision": "47f559f1c21fd5415a89d52b3e3f9939dbe32fa6", "repo_path": "integration/gaia-central" } From a4cb4740127af3790cbe6a301aa7ed0ea8566526 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 01:08:22 -0700 Subject: [PATCH 06/25] 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 e87644cc842..5deb1f6c355 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 f316f282190..6f44d97be54 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 f025a885dc1..5112296f4aa 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 9948d1d2b8e..eff4b7e1473 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 2cbc702d725..8ba48e96f8c 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 a0728f60ded..e090a9d29ee 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 f025a885dc1..5112296f4aa 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 19fe2f743af..1afea2aa7c7 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 e179d5fc350..44dd8958605 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 adf3ccc019c..622f26669ac 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 94d65412a42d5e14c0e972a8c1e090f347736d5f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 02:15:29 -0700 Subject: [PATCH 07/25] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3b3fd6b45055 Author: Rex KM Lee Desc: Merge pull request #30195 from rexboy7/1166684-embed-weather-widget Bug 1166684 - [Stingray][Dashboard] embed weather widget into dashboard. r=johnhu, yifan ======== https://hg.mozilla.org/integration/gaia-central/rev/4b9c23d69a86 Author: Rex Lee Desc: Bug 1166684 - [Stingray][Dashboard] embed weather widget into dashboard. --- 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 920e57a7608..3ace9ece6d5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "3f38f429cfd5d1260362d7fb3fbf52576bbec83b", + "git_revision": "bf4453575705e1fd37d1e18eac7f16b4957b0d63", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "47f559f1c21fd5415a89d52b3e3f9939dbe32fa6", + "revision": "3b3fd6b450553cd2edbb503ebe74933daaade836", "repo_path": "integration/gaia-central" } From cc77271aff5d9a8d32234dadf9752059577dc169 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 02:17:24 -0700 Subject: [PATCH 08/25] 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 5deb1f6c355..57f24260188 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 6f44d97be54..d19a2a2f61b 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 5112296f4aa..12505bc0697 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 eff4b7e1473..f64254c3d61 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 8ba48e96f8c..2624bf54203 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 e090a9d29ee..c91e84f403f 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 5112296f4aa..12505bc0697 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 1afea2aa7c7..47e07b88bc8 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 44dd8958605..600bdc7ca4d 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 622f26669ac..9485834eac7 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From f4861a62d9ec12e4e6a5b2f31504c89dfeb455cb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 03:05:26 -0700 Subject: [PATCH 09/25] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/422bc5bc6c23 Author: Sung Chiu Desc: Merge pull request #30187 from sean2449/Bug-1163493-epg-navigation Bug 1163492 - [Stingray][EPG] Navigation support for TV programs, r=johnhu ======== https://hg.mozilla.org/integration/gaia-central/rev/4b1c08095b8d Author: Sung Chiu Desc: Bug 1163492 - [Stingray][EPG] Navigation support for programs * Support up/down/left/right navigation * Add unit test * Add integration test --- 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 3ace9ece6d5..8ee78e63fc6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "bf4453575705e1fd37d1e18eac7f16b4957b0d63", + "git_revision": "0206e1eef9a1eb8346d3ef75be889510f4a586b9", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "3b3fd6b450553cd2edbb503ebe74933daaade836", + "revision": "422bc5bc6c23bc1058cad579dac78e6d964535d4", "repo_path": "integration/gaia-central" } From 0e0188ac717498deb4e4ebab9e1323e78ef78228 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 03:07:22 -0700 Subject: [PATCH 10/25] 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 57f24260188..b7919e0857b 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 d19a2a2f61b..2eaa26cb329 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 12505bc0697..a0a5cda9585 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 f64254c3d61..5035d3cb96b 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 2624bf54203..c6514500345 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 c91e84f403f..a0bb32141a7 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 12505bc0697..a0a5cda9585 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 47e07b88bc8..92c704a9a5f 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 600bdc7ca4d..18e0b7c0675 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 9485834eac7..da521884932 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From ab80eaeb7cdae9c61116bd3e829a9887ff417715 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 03:20:11 -0700 Subject: [PATCH 11/25] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a234938b009f Author: John Hu Desc: Merge pull request #30194 from huchengtw-moz/bug-1167517-browser-context-menu-cannot-open-twice Bug 1167517 - pick patches from bug 1098338 and bug 1136275, r=rexboy ======== https://hg.mozilla.org/integration/gaia-central/rev/69f4e8ee6daa Author: John Hu Desc: Bug 1167517 - pick patches from bug 1098338 and bug 1136275 ======== https://hg.mozilla.org/integration/gaia-central/rev/6d21e940eaaa Author: Luke Chang Desc: Merge pull request #30077 from luke-chang/1156723_add_system_remote Bug 1156723 - Add "system-remote" entry to system app along with a simplified window manager, r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/f10231ab8d72 Author: Luke Chang Desc: Bug 1156723 - Add "system-remote" entry to system app along with a simplified window manager ======== https://hg.mozilla.org/integration/gaia-central/rev/25912e576572 Author: Sung Chiu Desc: Merge pull request #30193 from sean2449/Bug-1167525 Bug 1167525 - [Stingray][Home] Hide home cards when home is not visible, r=rexboy ======== https://hg.mozilla.org/integration/gaia-central/rev/d6ed7ff8822b Author: Sung Chiu Desc: Bug 1167525 - [Stingray][Home] Hide home cards when home is not visible --- 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 8ee78e63fc6..5b1748a45cc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "0206e1eef9a1eb8346d3ef75be889510f4a586b9", + "git_revision": "ec259a0a6abc65d819b36bcf7693575530d4a243", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "422bc5bc6c23bc1058cad579dac78e6d964535d4", + "revision": "a234938b009f766de6d33c534fbb005f36388789", "repo_path": "integration/gaia-central" } From 7852cc2d847ba3779ac7a26670d754475b8a5c76 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 03:22:12 -0700 Subject: [PATCH 12/25] 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 b7919e0857b..6246b69e458 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 2eaa26cb329..d2afe330d2c 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 a0a5cda9585..1c335ffa37a 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 5035d3cb96b..51ccf25343c 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 c6514500345..eb2665aa118 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 a0bb32141a7..015898986f2 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 a0a5cda9585..1c335ffa37a 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 92c704a9a5f..fa70cc219f7 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 18e0b7c0675..0741571b5ce 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 da521884932..39ff67080e3 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 5b3832775f000dceaa602611c0f41f86ce104b67 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 03:40:32 -0700 Subject: [PATCH 13/25] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6a8700549a81 Author: Luke Chang Desc: Merge pull request #29908 from luke-chang/1156650_multiscreen_display_dialog Bug 1156650 - Show display dialog when launching app from homescreen, r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/76a5f8e98044 Author: Luke Chang Desc: Bug 1156650 - Show display dialog when launching app from homescreen --- 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 5b1748a45cc..ddda712c491 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "ec259a0a6abc65d819b36bcf7693575530d4a243", + "git_revision": "12b6953f90fe175415d99c9a55886807d5026317", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a234938b009f766de6d33c534fbb005f36388789", + "revision": "6a8700549a81fcff4e0925aeecb002966cfa0148", "repo_path": "integration/gaia-central" } From 1357b1fd3d27afbd439c4ed3ff5d39d2d14421e9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 03:42:55 -0700 Subject: [PATCH 14/25] 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 6246b69e458..63a157caf2d 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 d2afe330d2c..dfb31641295 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 1c335ffa37a..2ab7d2d01ce 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 51ccf25343c..2b3c76d32bb 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 eb2665aa118..6324ccfa30f 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 015898986f2..9db63812724 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 1c335ffa37a..2ab7d2d01ce 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 fa70cc219f7..a67806c5a8d 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 0741571b5ce..42dbdc620f1 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 39ff67080e3..d6f5475354c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 74f027c54fb95bf3717e6b5191e120273f96db63 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 05:25:12 -0700 Subject: [PATCH 15/25] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1de13bf3055d Author: Rob Wood Desc: Merge pull request #30179 from rwood-moz/bug1163088 Bug 1163088 - Run raptor suite 6x right off, use median results ======== https://hg.mozilla.org/integration/gaia-central/rev/b3185ab0db72 Author: Rob Wood Desc: Bug 1163088 - Run raptor suite 6x right off, use median results --- 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 ddda712c491..d404f011a39 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "12b6953f90fe175415d99c9a55886807d5026317", + "git_revision": "ea07a22e99979fbce2df447df73caf76c351909e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6a8700549a81fcff4e0925aeecb002966cfa0148", + "revision": "1de13bf3055d37a4870230b818c2a63ffdcc6d60", "repo_path": "integration/gaia-central" } From d56c466c8cb033203ad94933e9a8d4d723da80f2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 05:27:06 -0700 Subject: [PATCH 16/25] 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 63a157caf2d..294d4646926 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 dfb31641295..73ef2e3db0e 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 2ab7d2d01ce..0aa4f71df86 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 2b3c76d32bb..092dac081b9 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 6324ccfa30f..f2adf4e288b 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 9db63812724..8757fea2655 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 2ab7d2d01ce..0aa4f71df86 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 a67806c5a8d..8e94dc478c8 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 42dbdc620f1..508d82fd115 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 d6f5475354c..c562b435695 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 097ca222f8de78b5fa36bb7e9dc6c4eeb92b68ed Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 06:42:32 -0700 Subject: [PATCH 17/25] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7c8fece4dd8f Author: Dale Harvey Desc: Bug 1159411 - Add ability to preload webapps into customisation. r=rickychien ======== https://hg.mozilla.org/integration/gaia-central/rev/0e694b55f081 Author: Kevin Grandon Desc: Merge pull request #30217 from MichaelKohler/bug1138064 Bug 1138064 - Timezone change Cancun as of February 1 2015 ======== https://hg.mozilla.org/integration/gaia-central/rev/5f4eda18bc11 Author: Michael Kohler Desc: Bug 1138064 - Timezone change Cancun as of February 1 2015 --- 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 d404f011a39..9fbba244194 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "ea07a22e99979fbce2df447df73caf76c351909e", + "git_revision": "a68746f8fdce1d4c37751f72140dd9f2694debca", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1de13bf3055d37a4870230b818c2a63ffdcc6d60", + "revision": "7c8fece4dd8f7ddd61dbad1930e3ea661c784f90", "repo_path": "integration/gaia-central" } From c7f9cc167f935e0ed04e4371a9e6860506586e25 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 06:44:28 -0700 Subject: [PATCH 18/25] 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 294d4646926..6cd6465ddf7 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 73ef2e3db0e..5fa81b12672 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 0aa4f71df86..33916d64c69 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 092dac081b9..0601f285dec 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 f2adf4e288b..389becf7f1f 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 8757fea2655..b1b28df8ec6 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 0aa4f71df86..33916d64c69 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 8e94dc478c8..be6f81ad3d6 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 508d82fd115..c39d726f197 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 c562b435695..612114bcdf0 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 160a111f222686a0c55620f35075551583091567 Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Sun, 24 May 2015 11:36:00 -0400 Subject: [PATCH 19/25] Bug 1124338 - Fix possible camera cached parameters invalidation from underlying driver modification. r=aosmond --- dom/camera/GonkCameraControl.cpp | 10 +++++-- .../test/test_camera_fake_parameters.html | 27 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp index 090b1a65bc7..7b31e0ab3a5 100644 --- a/dom/camera/GonkCameraControl.cpp +++ b/dom/camera/GonkCameraControl.cpp @@ -179,7 +179,7 @@ nsGonkCameraControl::Initialize() mCurrentConfiguration.mRecorderProfile.Truncate(); // Initialize our camera configuration database. - PullParametersImpl(); + mCameraHw->PullParameters(mParams); // Set preferred preview frame format. mParams.Set(CAMERA_PARAM_PREVIEWFORMAT, NS_LITERAL_STRING("yuv420sp")); @@ -1127,7 +1127,13 @@ nsGonkCameraControl::PullParametersImpl() DOM_CAMERA_LOGI("Pulling camera parameters\n"); RETURN_IF_NO_CAMERA_HW(); - return mCameraHw->PullParameters(mParams); + nsresult rv = mCameraHw->PullParameters(mParams); + mParams.Get(CAMERA_PARAM_THUMBNAILSIZE, mLastThumbnailSize); + mParams.Get(CAMERA_PARAM_PICTURE_SIZE, mCurrentConfiguration.mPictureSize); + mParams.Get(CAMERA_PARAM_PREVIEWSIZE, mCurrentConfiguration.mPreviewSize); + mParams.Get(CAMERA_PARAM_VIDEOSIZE, mLastRecorderSize); + + return rv; } nsresult diff --git a/dom/camera/test/test_camera_fake_parameters.html b/dom/camera/test/test_camera_fake_parameters.html index da45ce7b013..df98f2fce86 100644 --- a/dom/camera/test/test_camera_fake_parameters.html +++ b/dom/camera/test/test_camera_fake_parameters.html @@ -527,6 +527,33 @@ suite.test('bug-1052851', function() { .then(resolve, suite.rejectGetCamera); }); +suite.test('bug-1124338', function() { + function triggerAutoFocus(p) { + var sync = new Promise(function(resolve, reject) { + function onEvent(e) { + suite.camera.removeEventListener('focus', onEvent); + var thumbnailSize = suite.camera.getThumbnailSize(); + ok(thumbnailSize.width == 640 && thumbnailSize.height == 480, 'thumbnail size reset with auto focus'); + resolve(); + } + suite.camera.addEventListener('focus', onEvent); + }); + + var initThumbnailSize = suite.camera.getThumbnailSize(); + ok(initThumbnailSize.width == 320 && initThumbnailSize.height == 240, 'initial thumbnail size incorrect'); + suite.hw.params['jpeg-thumbnail-width'] = '640'; + suite.hw.params['jpeg-thumbnail-height'] = '480'; + suite.hw.fireAutoFocusComplete(false); + return sync; + } + + suite.hw.params['jpeg-thumbnail-size-values'] = '320x240,640x480'; + suite.hw.params['jpeg-thumbnail-width'] = '320'; + suite.hw.params['jpeg-thumbnail-height'] = '240'; + return suite.getCamera() + .then(triggerAutoFocus) +}); + suite.setup() .then(suite.run); From 56224435d60ca2ac263358bea993b9e09cac4c2a Mon Sep 17 00:00:00 2001 From: Jocelyn Liu Date: Fri, 22 May 2015 20:07:00 -0400 Subject: [PATCH 20/25] Bug 1167070 - Overwrite BLE related flags to enable BLE functionalities in bluedroid for both bluetooth1 and bluetooth2. r=shuang --- dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h b/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h index c51b2f90bdd..5bb186f2ebd 100644 --- a/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h +++ b/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h @@ -41,4 +41,9 @@ /* SDP AVRCP 1.5 feature */ #define SDP_AVRCP_1_5 FALSE +/* BLE Feature */ +#define BTA_GATT_INCLUDED TRUE +#define BLE_INCLUDED TRUE +#define SMP_INCLUDED TRUE + #endif /* B2G_BDROID_BUILDCFG_H */ From 8beab86d475f2dd1851f695c61a46f5f650b8f5c Mon Sep 17 00:00:00 2001 From: JerryShih Date: Fri, 22 May 2015 11:20:00 -0400 Subject: [PATCH 21/25] Bug 1167535 - Fix fanotify 4g size limit. r=fabrice --- hal/gonk/GonkDiskSpaceWatcher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/gonk/GonkDiskSpaceWatcher.cpp b/hal/gonk/GonkDiskSpaceWatcher.cpp index ef3359525ef..6caf13fb88f 100644 --- a/hal/gonk/GonkDiskSpaceWatcher.cpp +++ b/hal/gonk/GonkDiskSpaceWatcher.cpp @@ -177,7 +177,7 @@ GonkDiskSpaceWatcher::DoStart() NS_ASSERTION(XRE_GetIOMessageLoop() == MessageLoopForIO::current(), "Not on the correct message loop"); - mFd = fanotify_init(FAN_CLASS_NOTIF, FAN_CLOEXEC); + mFd = fanotify_init(FAN_CLASS_NOTIF, FAN_CLOEXEC | O_LARGEFILE); if (mFd == -1) { if (errno == ENOSYS) { NS_WARNING("Warning: No fanotify support in this device's kernel.\n"); From bc8e255c0b93f63198790f51d5ce735429999e56 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 11:35:28 -0700 Subject: [PATCH 22/25] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/27818d086e44 Author: autolander Desc: Bug 1167202 - merge pull request #30177 from yzen:bug-1167202 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/a5df0c8e8c10 Author: Yura Zenevich Desc: Bug 1167202 - adding strings for newly supported switch role. ======== https://hg.mozilla.org/integration/gaia-central/rev/dfd14031c8ef Author: autolander Desc: Bug 1166612 - merge pull request #30145 from dwi2:bug1166612 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/ef87fd9f68de Author: Tzu-Lin Huang Desc: Bug 1166612 - [Stingray] Hide filter when entering edit mode --- 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 9fbba244194..234e49722aa 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a68746f8fdce1d4c37751f72140dd9f2694debca", + "git_revision": "3435c67e924a18a55f601485b4fd0e5982fe7ae0", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7c8fece4dd8f7ddd61dbad1930e3ea661c784f90", + "revision": "27818d086e44aad7da44d971f9e30d4c5afe98c8", "repo_path": "integration/gaia-central" } From 6f560a23032054c938da3d9f3ff2acc209f19ebc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 11:37:24 -0700 Subject: [PATCH 23/25] 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 6cd6465ddf7..99703001366 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 5fa81b12672..cb87981b28c 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 33916d64c69..83bc48a90bf 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 0601f285dec..f34ac26831d 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 389becf7f1f..59547733e18 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 b1b28df8ec6..1fae5658775 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 33916d64c69..83bc48a90bf 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 be6f81ad3d6..f34b403df3f 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 c39d726f197..36425427803 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 612114bcdf0..0470d0a438f 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From af72084a5a50185c20509c4d90750b8e934637e5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 13:40:33 -0700 Subject: [PATCH 24/25] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/70c21fc8fb4b Author: autolander Desc: Bug 1167637 - merge pull request #30205 from mikehenrty:bug-1167637-apps-tests to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/a1a69da6c3da Author: Michael Henretty Desc: Bug 1167637 - Re-enable apps_test.js --- 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 234e49722aa..999a36c90aa 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "3435c67e924a18a55f601485b4fd0e5982fe7ae0", + "git_revision": "7cd4130d4f988562a77d126860408ada65bb95ef", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "27818d086e44aad7da44d971f9e30d4c5afe98c8", + "revision": "70c21fc8fb4b014e751d1442161c4beabbfaa6bd", "repo_path": "integration/gaia-central" } From 639861b401d2c813a0a93708821bb5bbf78f4e3c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 25 May 2015 13:42:56 -0700 Subject: [PATCH 25/25] 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 99703001366..ff1206a7afc 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 cb87981b28c..3bb72cf995e 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 83bc48a90bf..c7b7ab69468 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 f34ac26831d..9126978cedf 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 59547733e18..5647782a0cc 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 1fae5658775..1f01e0dafdd 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 83bc48a90bf..c7b7ab69468 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 f34b403df3f..ee3cca6b089 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 36425427803..667d23916d0 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 0470d0a438f..4e4502b4ec0 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +