From 3a96f19981c1e4bfa46282240df9161da7acadef Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:17:37 -0700 Subject: [PATCH 01/13] Bumping gaia.json for 4 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/65b6f43129f7 Author: Kevin Grandon Desc: Merge pull request #31988 from jedireza/private-browsing-alt Bug 1193576 - Add a setting to browse privately by default ======== https://hg.mozilla.org/integration/gaia-central/rev/f6aa6128d480 Author: jedireza Desc: Bug 1193576 - Add a setting to browse privately by default ======== https://hg.mozilla.org/integration/gaia-central/rev/8586e41788d5 Author: Yura Zenevich Desc: Merge pull request #31984 from yzen/bug-1206305 Bug 1206305 - fixing a regression with ambient indicator flicker when… ======== https://hg.mozilla.org/integration/gaia-central/rev/a50272612e7a Author: Yura Zenevich Desc: Bug 1206305 - fixing a regression with ambient indicator flicker when lockscreen is shown --- 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 c94aba5ba74d..25442692f83b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4bb17b24620818cbda0ba0c0d69e0ce3f914e1b7", + "git_revision": "f1cb3089ee2a77dd779408ca86dbb5e4ed5af0b3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "0bdd0b54cb40d7e928e9e6de720c0506dc7e52db", + "revision": "65b6f43129f7884ee32670828f9e8ef5f5de888d", "repo_path": "integration/gaia-central" } From e3733c609f2a3ff7f6d552b5ad3ba656e3a9908d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:18:03 -0700 Subject: [PATCH 02/13] 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-kk/sources.xml | 148 ++++++++++++++++++++++++++++ b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 158 insertions(+), 10 deletions(-) create mode 100644 b2g/config/nexus-4-kk/sources.xml diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index bdf552561c94..f22ea65f59d8 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 90b30122e6f6..3d60bef6755d 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 b1a0f0a09db2..53c89d83cd12 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 8615506942e9..574033be3698 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 a92629c37ed1..64a6256136b1 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 46893a8a3217..3c0d4347c391 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 b1a0f0a09db2..53c89d83cd12 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 fbd995b72f69..1891e588b455 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-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml new file mode 100644 index 000000000000..aa43894c4310 --- /dev/null +++ b/b2g/config/nexus-4-kk/sources.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 677c900018f3..635ef37fb08d 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 4d55ff130525..bf825c20401a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7db3d6c1469ea6af44a6ac3e14fe95ff2d4800d3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:21:48 -0700 Subject: [PATCH 03/13] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1091627afb83 Author: Timothy Guan-tin Chien Desc: Merge pull request #31815 from BorisChiou/Bug1198522 Bug 1198522 - Separate customized and sys cmd menu items, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/3ddd0ab5a52d Author: Boris Chiou Desc: Bug 1198522 - Fix the check for certified apps --- 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 25442692f83b..507411c99ea6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "f1cb3089ee2a77dd779408ca86dbb5e4ed5af0b3", + "git_revision": "98bc7efb7c79b180bde067b3a1b000106c356f13", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "65b6f43129f7884ee32670828f9e8ef5f5de888d", + "revision": "1091627afb839253e3237a887f131a08dfa59984", "repo_path": "integration/gaia-central" } From 0dff5b9aeac1ceef6438c8cb49295e6a0a2c1230 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:24:40 -0700 Subject: [PATCH 04/13] 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-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index f22ea65f59d8..c45481714ee9 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 3d60bef6755d..33d2cb671067 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 53c89d83cd12..adf9692741d5 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 574033be3698..680aec13d798 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 64a6256136b1..7fe553d6eb68 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 3c0d4347c391..29044ebd4af4 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 53c89d83cd12..adf9692741d5 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 1891e588b455..5aec4d2a018c 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-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index aa43894c4310..45bd55f27351 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 635ef37fb08d..06c1b8c185b7 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 bf825c20401a..535dcaa1e00e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 62f942cc48c86348304a749d08885a411a1d3e81 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:27:19 -0700 Subject: [PATCH 05/13] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/61a77f72e2ef Author: Carsten Book Desc: Merge pull request #31967 from ShakoHo/1205238 Bug 1205238 - Will raise Element is not currently visible and may not be manipulated when calling tap_comment(). r=npark ======== https://hg.mozilla.org/integration/gaia-central/rev/63fa9b6ac42f Author: shako Desc: Bug 1205238 - Will raise Element is not currently visible and may not be manipulated when calling tap_comment() ======== https://hg.mozilla.org/integration/gaia-central/rev/78c7dadf4716 Author: shako Desc: Bug 1205238 - Will raise Element is not currently visible and may not be manipulated when calling tap_comment() ======== https://hg.mozilla.org/integration/gaia-central/rev/b319eb7771aa Author: Carsten Book Desc: Merge pull request #32017 from aosmond/bug1196195 Bug 1196195 - Prevent multiple image resizes from being triggered. r=jdarcangelo ======== https://hg.mozilla.org/integration/gaia-central/rev/4a45e9ac45c3 Author: Andrew Osmond Desc: Bug 1196195 - Prevent multiple image resizes from being triggered. --- 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 507411c99ea6..a739dc97ba8b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "98bc7efb7c79b180bde067b3a1b000106c356f13", + "git_revision": "7e72976ec55a38d7a72d383eb8d3d797b75e71f1", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1091627afb839253e3237a887f131a08dfa59984", + "revision": "61a77f72e2ef3e0c97300007928dd06bf5b90888", "repo_path": "integration/gaia-central" } From e38463707121e3a45d23cec353db91b676f72445 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:30:13 -0700 Subject: [PATCH 06/13] 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-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index c45481714ee9..0363318abb87 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 33d2cb671067..072c73d8b407 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 adf9692741d5..7443cc7cd3b4 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 680aec13d798..b338c4aca69e 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 7fe553d6eb68..4258be0a9224 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 29044ebd4af4..e90f549d202e 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 adf9692741d5..7443cc7cd3b4 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 5aec4d2a018c..321beb53f030 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-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 45bd55f27351..a1904b570c19 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 06c1b8c185b7..ae714f92ba48 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 535dcaa1e00e..86abee07997a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 26c675b5495e2752800de2a2ad830bd01dcb49d7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:36:47 -0700 Subject: [PATCH 07/13] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/754c41de25dc Author: Chris Lord Desc: Merge pull request #32003 from Cwiiis/bug1207534-new-homescreen-wrong-settings Bug 1207534 - Correct the settings launcher. r=albertopq ======== https://hg.mozilla.org/integration/gaia-central/rev/654999d11702 Author: Chris Lord Desc: Bug 1207534 - Correct the settings launcher. r=albertopq --- 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 a739dc97ba8b..976fdff866f2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "7e72976ec55a38d7a72d383eb8d3d797b75e71f1", + "git_revision": "f1cb3089ee2a77dd779408ca86dbb5e4ed5af0b3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "61a77f72e2ef3e0c97300007928dd06bf5b90888", + "revision": "754c41de25dcb48c7b1f18f13900d0212ed7fb07", "repo_path": "integration/gaia-central" } From 8cbb627c7ab442dfe5198f8363284b5e4ad6d2be Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 24 Sep 2015 09:39:41 -0700 Subject: [PATCH 08/13] 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-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 0363318abb87..f22ea65f59d8 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 072c73d8b407..3d60bef6755d 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 7443cc7cd3b4..53c89d83cd12 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 b338c4aca69e..574033be3698 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 4258be0a9224..64a6256136b1 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 e90f549d202e..3c0d4347c391 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 7443cc7cd3b4..53c89d83cd12 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 321beb53f030..1891e588b455 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-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index a1904b570c19..aa43894c4310 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ae714f92ba48..635ef37fb08d 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 86abee07997a..bf825c20401a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 34798869bb5c438b696d8998d753f94c550bdcd9 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Thu, 24 Sep 2015 13:51:31 -0300 Subject: [PATCH 09/13] Bug 1207986: Add java-openjdk package to phone-builder image. r=garndt This package is necessary to build Aries fota updates. --HG-- extra : commitid : DAKZqS5wKeJ --- testing/docker/phone-builder/Dockerfile | 2 +- testing/docker/phone-builder/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/docker/phone-builder/Dockerfile b/testing/docker/phone-builder/Dockerfile index 97f0f05deb8f..bb4de4033133 100644 --- a/testing/docker/phone-builder/Dockerfile +++ b/testing/docker/phone-builder/Dockerfile @@ -8,7 +8,7 @@ ADD bin /home/worker/bin ADD config /home/worker/.aws/config ADD socorro.token /home/worker/socorro.token -RUN yum install -y bc lzop +RUN yum install -y bc lzop java-1.7.0-openjdk RUN pip install awscli RUN npm install -g bower gulp apm grunt-cli diff --git a/testing/docker/phone-builder/VERSION b/testing/docker/phone-builder/VERSION index fe04e7f676f5..236c7ad084dd 100644 --- a/testing/docker/phone-builder/VERSION +++ b/testing/docker/phone-builder/VERSION @@ -1 +1 @@ -0.0.20 +0.0.21 From 44b885ef4c4dda91db9847b67cf429bda3497f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Thu, 24 Sep 2015 09:55:52 -0700 Subject: [PATCH 10/13] Bug 1201646 - Basic updates support r=snorp --- b2g/chrome/content/settings.js | 4 +++- mobile/android/b2gdroid/app/Makefile.in | 2 ++ mobile/android/b2gdroid/app/src/main/AndroidManifest.xml | 6 ++++++ .../app/src/main/java/org/mozilla/b2gdroid/Launcher.java | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js index 038f73b3d92a..6a79ab212a73 100644 --- a/b2g/chrome/content/settings.js +++ b/b2g/chrome/content/settings.js @@ -20,6 +20,7 @@ const Cr = Components.results; Cu.import('resource://gre/modules/SettingsRequestManager.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/Services.jsm'); +Cu.import('resource://gre/modules/AppConstants.jsm'); #ifdef MOZ_WIDGET_GONK XPCOMUtils.defineLazyGetter(this, "libcutils", function () { @@ -327,7 +328,8 @@ setUpdateTrackingId(); }); } - syncCharPref('app.update.url'); + syncCharPref(AppConstants.MOZ_B2GDROID ? 'app.update.url.android' + : 'app.update.url'); syncCharPref('app.update.channel'); })(); diff --git a/mobile/android/b2gdroid/app/Makefile.in b/mobile/android/b2gdroid/app/Makefile.in index 87dec2d0f8ba..12d27477a037 100644 --- a/mobile/android/b2gdroid/app/Makefile.in +++ b/mobile/android/b2gdroid/app/Makefile.in @@ -21,6 +21,8 @@ JAVAFILES := \ # org.mozilla.gecko.R itself. jars_dir := $(DEPTH)/mobile/android/base ANDROID_EXTRA_JARS := $(filter-out %gecko-R.jar,$(wildcard $(jars_dir)/*.jar)) +# Needed for the UpdateService +ANDROID_EXTRA_JARS += $(ANDROID_COMPAT_LIB) # The GeckoView consuming APK depends on the GeckoView resources. This hacks a # type of poor man's AAR support. diff --git a/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml b/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml index 97cbad7331d3..c5886ebad513 100644 --- a/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml +++ b/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml @@ -109,6 +109,12 @@ + + + diff --git a/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java b/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java index c53d1501e33c..d245fbc05e8a 100644 --- a/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java +++ b/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Launcher.java @@ -28,6 +28,7 @@ import org.mozilla.gecko.GeckoBatteryManager; import org.mozilla.gecko.GeckoEvent; import org.mozilla.gecko.GeckoThread; import org.mozilla.gecko.IntentHelper; +import org.mozilla.gecko.updater.UpdateServiceHelper; import org.mozilla.gecko.util.GeckoEventListener; import org.mozilla.b2gdroid.ScreenStateObserver; @@ -86,6 +87,8 @@ public class Launcher extends Activity GeckoAppShell.setGeckoInterface(new BaseGeckoInterface(this)); + UpdateServiceHelper.registerForUpdates(this); + EventDispatcher.getInstance().registerGeckoThreadListener(this, "Launcher:Ready"); From b32ea8e77ed1a761805e168710f44f1b903115e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Thu, 24 Sep 2015 09:55:52 -0700 Subject: [PATCH 11/13] Bug 1207417 - Settings mapper to sync b2g and android configurations r=snorp --- mobile/android/b2gdroid/app/Makefile.in | 1 + .../b2gdroid/app/src/main/AndroidManifest.xml | 3 + .../java/org/mozilla/b2gdroid/Launcher.java | 4 + .../org/mozilla/b2gdroid/SettingsMapper.java | 247 ++++++++++++++++++ .../b2gdroid/components/MessagesBridge.jsm | 84 +++++- 5 files changed, 327 insertions(+), 12 deletions(-) create mode 100644 mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/SettingsMapper.java diff --git a/mobile/android/b2gdroid/app/Makefile.in b/mobile/android/b2gdroid/app/Makefile.in index 12d27477a037..248a954ff7e8 100644 --- a/mobile/android/b2gdroid/app/Makefile.in +++ b/mobile/android/b2gdroid/app/Makefile.in @@ -8,6 +8,7 @@ JAVAFILES := \ src/main/java/org/mozilla/b2gdroid/Apps.java \ src/main/java/org/mozilla/b2gdroid/Launcher.java \ src/main/java/org/mozilla/b2gdroid/ScreenStateObserver.java \ + src/main/java/org/mozilla/b2gdroid/SettingsMapper.java \ $(NULL) # The GeckoView consuming APK depends on the GeckoView JAR files. There are two diff --git a/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml b/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml index c5886ebad513..22f52cc38f0e 100644 --- a/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml +++ b/mobile/android/b2gdroid/app/src/main/AndroidManifest.xml @@ -49,6 +49,9 @@ + + + mGeckoSettings; + private Hashtable mAndroidSettings; + + abstract class BaseMapping { + // Returns the list of gaia settings that are managed this class. + abstract String[] getGeckoSettings(); + + // Returns the list of android settings that are managed this class. + abstract String[] getAndroidSettings(); + + // Called when we a registered gecko setting changes. + abstract void onGeckoChange(String setting, JSONObject message); + + // Called when we a registered android setting changes. + abstract void onAndroidChange(Uri uri); + + void sendGeckoSetting(String name, String value) { + JSONObject obj = new JSONObject(); + try { + obj.put(name, value); + sendGeckoSetting(obj); + } catch(JSONException e) { + Log.d(LOGTAG, e.toString()); + } + } + + void sendGeckoSetting(String name, long value) { + JSONObject obj = new JSONObject(); + try { + obj.put(name, value); + sendGeckoSetting(obj); + } catch(JSONException e) { + Log.d(LOGTAG, e.toString()); + } + } + + void sendGeckoSetting(JSONObject obj) { + GeckoEvent e = GeckoEvent.createBroadcastEvent("Android:Setting", obj.toString()); + GeckoAppShell.sendEventToGecko(e); + } + } + + class ScreenTimeoutMapping extends BaseMapping { + ScreenTimeoutMapping() {} + + String[] getGeckoSettings() { + String props[] = {"screen.timeout"}; + return props; + } + + String[] getAndroidSettings() { + String props[] = {"content://settings/system/screen_off_timeout"}; + return props; + } + + void onGeckoChange(String setting, JSONObject message) { + try { + int timeout = message.getInt("value"); + // b2g uses seconds for the timeout while Android expects ms. + // "never" is 0 in b2g, -1 in Android. + if (timeout == 0) { + timeout = -1; + } else { + timeout *= 1000; + } + System.putInt(mContext.getContentResolver(), + System.SCREEN_OFF_TIMEOUT, + timeout); + } catch(Exception ex) { + Log.d(LOGTAG, "Error setting screen.timeout value", ex); + } + } + + void onAndroidChange(Uri uri) { + try { + int timeout = System.getInt(mContext.getContentResolver(), + System.SCREEN_OFF_TIMEOUT); + Log.d(LOGTAG, "Android set timeout to " + timeout); + + // Convert to a gaia timeout. + timeout /= 1000; + sendGeckoSetting("screen.timeout", timeout); + } catch(Exception e) {} + } + } + + class WallpaperMapping extends BaseMapping { + private Context mContext; + + WallpaperMapping(Context context) { + mContext = context; + } + + String[] getGeckoSettings() { + String props[] = {"wallpaper.image"}; + return props; + } + + String[] getAndroidSettings() { + String props[] = {}; + return props; + } + + void onGeckoChange(String setting, JSONObject message) { + try { + final String url = message.getString("value"); + Log.d(LOGTAG, "wallpaper.image is now " + url); + WallpaperManager manager = WallpaperManager.getInstance(mContext); + // Remove the data:image/png;base64, prefix from the url. + byte[] raw = Base64.decode(url.substring(22), Base64.NO_WRAP); + Bitmap bitmap = BitmapFactory.decodeByteArray(raw, 0, raw.length); + if (bitmap == null) { + Log.d(LOGTAG, "Unable to create a bitmap!"); + } + manager.setBitmap(bitmap); + } catch(Exception ex) { + Log.d(LOGTAG, "Error setting wallpaper", ex); + } + } + + // Android doesn't notify on wallpaper changes. + void onAndroidChange(Uri uri) { } + } + + SettingsMapper(Context context, Handler handler) { + super(handler); + mContext = context; + EventDispatcher.getInstance() + .registerGeckoThreadListener(this, + "Settings:Change"); + + mContext.getContentResolver() + .registerContentObserver(System.CONTENT_URI, + true, + this); + + mGeckoSettings = new Hashtable(); + mAndroidSettings = new Hashtable(); + + // Add all the mappings. + addMapping(new ScreenTimeoutMapping()); + addMapping(new WallpaperMapping(mContext)); + } + + void addMapping(BaseMapping mapping) { + String[] props = mapping.getGeckoSettings(); + for (int i = 0; i < props.length; i++) { + mGeckoSettings.put(props[i], mapping); + } + + props = mapping.getAndroidSettings(); + for (int i = 0; i < props.length; i++) { + mAndroidSettings.put(props[i], mapping); + } + } + + void destroy() { + EventDispatcher.getInstance() + .unregisterGeckoThreadListener(this, + "Settings:Change"); + mGeckoSettings.clear(); + mGeckoSettings = null; + mAndroidSettings.clear(); + mAndroidSettings = null; + mContext.getContentResolver().unregisterContentObserver(this); + } + + public void handleMessage(String event, JSONObject message) { + Log.w(LOGTAG, "Received " + event); + + try { + String setting = message.getString("setting"); + BaseMapping mapping = mGeckoSettings.get(setting); + if (mapping != null) { + Log.d(LOGTAG, "Changing gecko setting " + setting); + mapping.onGeckoChange(setting, message); + } else { + Log.d(LOGTAG, "No gecko mapping registered for " + setting); + } + } catch(Exception ex) { + Log.d(LOGTAG, "Error getting setting name", ex); + } + } + + // ContentObserver, see + // http://developer.android.com/reference/android/database/ContentObserver.html + @Override + public boolean deliverSelfNotifications() { + return false; + } + + @Override + public void onChange(boolean selfChange) { + onChange(selfChange, null); + } + + @Override + public void onChange(boolean selfChange, Uri uri) { + super.onChange(selfChange); + Log.d(LOGTAG, "Settings change detected uri=" + uri); + BaseMapping mapping = mAndroidSettings.get(uri.toString()); + if (mapping != null) { + Log.d(LOGTAG, "Changing android setting " + uri); + mapping.onAndroidChange(uri); + } else { + Log.d(LOGTAG, "No android mapping registered for " + uri); + } + } + +} diff --git a/mobile/android/b2gdroid/components/MessagesBridge.jsm b/mobile/android/b2gdroid/components/MessagesBridge.jsm index c0cf531cc77d..3bc8be5790f5 100644 --- a/mobile/android/b2gdroid/components/MessagesBridge.jsm +++ b/mobile/android/b2gdroid/components/MessagesBridge.jsm @@ -6,35 +6,44 @@ this.EXPORTED_SYMBOLS = ["MessagesBridge"]; const { classes: Cc, interfaces: Ci, utils: Cu } = Components; +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/SystemAppProxy.jsm"); +Cu.import("resource://gre/modules/Messaging.jsm"); + +XPCOMUtils.defineLazyServiceGetter(this, "settings", + "@mozilla.org/settingsService;1", + "nsISettingsService"); // This module receives messages from Launcher.java as observer notifications. +// It also listens for settings changes to relay them back to Android. function debug() { dump("-*- MessagesBridge " + Array.slice(arguments) + "\n"); } +function getWindow() { + return SystemAppProxy.getFrame().contentWindow || + Services.wm.getMostRecentWindow("navigator:browser"); +} + +// To prevent roundtrips like android -> gecko -> android we keep track of +// in flight setting changes. +let _blockedSettings = new Set(); + this.MessagesBridge = { init: function() { - Services.obs.addObserver(this, "Android:Launcher", false); + Services.obs.addObserver(this.onAndroidMessage, "Android:Launcher", false); + Services.obs.addObserver(this.onAndroidSetting, "Android:Setting", false); + Services.obs.addObserver(this.onSettingChange, "mozsettings-changed", false); Services.obs.addObserver(this, "xpcom-shutdown", false); }, - observe: function(aSubject, aTopic, aData) { - if (aTopic == "xpcom-shutdown") { - Services.obs.removeObserver(this, "Android:Launcher"); - Services.obs.removeObserver(this, "xpcom-shutdown"); - } - - if (aTopic != "Android:Launcher") { - return; - } - + onAndroidMessage: function(aSubject, aTopic, aData) { let data = JSON.parse(aData); debug(`Got Android:Launcher message ${data.action}`); - let window = SystemAppProxy.getFrame().contentWindow; + let window = getWindow(); switch (data.action) { case "screen_on": case "screen_off": @@ -53,6 +62,57 @@ this.MessagesBridge = { window.dispatchEvent(new window.KeyboardEvent("keyup", { key: "Home" })); break; } + }, + + onAndroidSetting: function(aSubject, aTopic, aData) { + let data = JSON.parse(aData); + let lock = settings.createLock(); + let key = Object.keys(data)[0]; + debug(`Got Android:Setting message ${key} -> ${data[key]}`); + // Don't relay back to android the same setting change. + _blockedSettings.add(key); + lock.set(key, data[key], null); + }, + + onSettingChange: function(aSubject, aTopic, aData) { + if ("wrappedJSObject" in aSubject) { + aSubject = aSubject.wrappedJSObject; + } + if (aSubject) { + debug("Got setting change: " + aSubject.key + " -> " + aSubject.value); + + if (_blockedSettings.has(aSubject.key)) { + _blockedSettings.delete(aSubject.key); + debug("Rejecting blocked setting change for " + aSubject.key); + return; + } + + let window = getWindow(); + + if (aSubject.value instanceof window.Blob) { + debug(aSubject.key + " is a Blob"); + let reader = new window.FileReader(); + reader.readAsDataURL(aSubject.value); + reader.onloadend = function() { + Messaging.sendRequest({ type: "Settings:Change", + setting: aSubject.key, + value: reader.result }); + } + } else { + Messaging.sendRequest({ type: "Settings:Change", + setting: aSubject.key, + value: aSubject.value }); + } + } + }, + + observe: function(aSubject, aTopic, aData) { + if (aTopic == "xpcom-shutdown") { + Services.obs.removeObserver(this.onAndroidMessage, "Android:Launcher"); + Services.obs.removeObserver(this.onAndroidSetting, "Android:Setting"); + Services.obs.removeObserver(this.onSettingChange, "mozsettings-changed"); + Services.obs.removeObserver(this, "xpcom-shutdown"); + } } } From b1f264280efa5de22b8c95f99e14d761b3f39fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Thu, 24 Sep 2015 09:55:52 -0700 Subject: [PATCH 12/13] Bug 1207682 - Bring back android.support.v4.app.NotificationManagerCompat r=fabrice --- mobile/android/b2gdroid/app/Makefile.in | 6 ++++++ mobile/android/b2gdroid/app/moz.build | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/mobile/android/b2gdroid/app/Makefile.in b/mobile/android/b2gdroid/app/Makefile.in index 248a954ff7e8..42d8c62eefd3 100644 --- a/mobile/android/b2gdroid/app/Makefile.in +++ b/mobile/android/b2gdroid/app/Makefile.in @@ -25,6 +25,12 @@ ANDROID_EXTRA_JARS := $(filter-out %gecko-R.jar,$(wildcard $(jars_dir)/*.jar)) # Needed for the UpdateService ANDROID_EXTRA_JARS += $(ANDROID_COMPAT_LIB) +ANDROID_EXTRA_JARS += \ + $(ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB) \ + $(ANDROID_SUPPORT_V4_AAR_LIB) \ + $(ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB) \ + $(NULL) + # The GeckoView consuming APK depends on the GeckoView resources. This hacks a # type of poor man's AAR support. .aapt.deps: .geckoview_resources.deps diff --git a/mobile/android/b2gdroid/app/moz.build b/mobile/android/b2gdroid/app/moz.build index fb6e0b5fbc08..374f9f2079b1 100644 --- a/mobile/android/b2gdroid/app/moz.build +++ b/mobile/android/b2gdroid/app/moz.build @@ -25,6 +25,10 @@ ANDROID_ASSETS_DIRS += [ # will not induce accesses to other package's resources at runtime. ANDROID_EXTRA_PACKAGES += ['org.mozilla.gecko'] +if CONFIG['ANDROID_SUPPORT_V4_AAR']: + ANDROID_EXTRA_PACKAGES += ['android.support.v4'] + ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_SUPPORT_V4_AAR_RES']] + JS_PREFERENCE_FILES += [ 'b2gdroid.js', ] From d4aa7f63e2d24e185342f74b414f1d97790c55ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Thu, 24 Sep 2015 11:53:05 -0700 Subject: [PATCH 13/13] Bug 1204557 - Stop using base64 for native app icons in the application registry r=jchen --- dom/apps/AndroidUtils.jsm | 3 +- .../main/java/org/mozilla/b2gdroid/Apps.java | 12 +--- mobile/android/base/GeckoAppShell.java | 69 +++++++++++++++++++ widget/android/AndroidBridge.cpp | 2 +- 4 files changed, 73 insertions(+), 13 deletions(-) diff --git a/dom/apps/AndroidUtils.jsm b/dom/apps/AndroidUtils.jsm index fbf89829e0ba..4668772a5190 100644 --- a/dom/apps/AndroidUtils.jsm +++ b/dom/apps/AndroidUtils.jsm @@ -57,7 +57,8 @@ this.AndroidUtils = { // We put the version with the normal case as part of the manifest url. let [origin, manifestURL] = this.getOriginAndManifestURL(aApp.packagename); - // TODO: Bug 1204557 to improve the icons support. + // We choose 96 as an arbitrary size since we can only get one icon + // from Android. let manifest = { name: aApp.name, icons: { "96": aApp.icon } diff --git a/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Apps.java b/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Apps.java index 26966400405c..ae6ddfcf6c66 100644 --- a/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Apps.java +++ b/mobile/android/b2gdroid/app/src/main/java/org/mozilla/b2gdroid/Apps.java @@ -76,17 +76,7 @@ class Apps extends BroadcastReceiver (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0; obj.put("removable", removable); - - // For now, create a data: url for the icon, since we need additional - // android:// protocol support for icons. Once it's there we'll do - // something like: obj.put("icon", "android:icon/" + info.packageName); - Drawable d = pm.getApplicationIcon(info.packageName); - Bitmap bitmap = ((BitmapDrawable)d).getBitmap(); - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream); - byte[] byteArray = byteArrayOutputStream.toByteArray(); - String encoded = Base64.encodeToString(byteArray, Base64.DEFAULT); - obj.put("icon", "data:image/png;base64," + encoded); + obj.put("icon", "android://icon/" + appInfo.packageName); } catch(Exception ex) { Log.wtf(LOGTAG, "Error building ActivityInfo JSON", ex); } diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java index 2094c05a0f9c..557458adbe6f 100644 --- a/mobile/android/base/GeckoAppShell.java +++ b/mobile/android/base/GeckoAppShell.java @@ -13,6 +13,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.net.MalformedURLException; import java.net.Proxy; import java.net.URI; import java.net.URISyntaxException; @@ -2592,6 +2595,55 @@ public class GeckoAppShell return connection.getInputStream(); } + private static class BitmapConnection extends URLConnection { + private Bitmap bitmap; + + BitmapConnection(Bitmap b) throws MalformedURLException, IOException { + super(null); + bitmap = b; + } + + @Override + public void connect() {} + + @Override + public InputStream getInputStream() throws IOException { + return new BitmapInputStream(); + } + + @Override + public String getContentType() { + return "image/png"; + } + + private final class BitmapInputStream extends PipedInputStream { + private boolean mHaveConnected = false; + + @Override + public synchronized int read(byte[] buffer, int byteOffset, int byteCount) + throws IOException { + if (mHaveConnected) { + return super.read(buffer, byteOffset, byteCount); + } + + final PipedOutputStream output = new PipedOutputStream(); + connect(output); + ThreadUtils.postToBackgroundThread( + new Runnable() { + @Override + public void run() { + try { + bitmap.compress(Bitmap.CompressFormat.PNG, 100, output); + output.close(); + } catch (IOException ioe) {} + } + }); + mHaveConnected = true; + return super.read(buffer, byteOffset, byteCount); + } + } + } + @WrapForJNI(allowMultithread = true, narrowChars = true) static URLConnection getConnection(String url) { try { @@ -2602,6 +2654,23 @@ public class GeckoAppShell spec = url.substring(8); } + // Check if we are loading a package icon. + try { + if (spec.startsWith("icon/")) { + String[] splits = spec.split("/"); + if (splits.length != 2) { + return null; + } + final String pkg = splits[1]; + final PackageManager pm = getContext().getPackageManager(); + final Drawable d = pm.getApplicationIcon(pkg); + final Bitmap bitmap = BitmapUtils.getBitmapFromDrawable(d); + return new BitmapConnection(bitmap); + } + } catch(Exception ex) { + Log.e(LOGTAG, "error", ex); + } + // if the colon got stripped, put it back int colon = spec.indexOf(':'); if (colon == -1 || colon > spec.indexOf('/')) { diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp index 1b09aa251214..7faff0b49af6 100644 --- a/widget/android/AndroidBridge.cpp +++ b/widget/android/AndroidBridge.cpp @@ -2087,7 +2087,7 @@ AndroidBridge::SetPresentationSurface(EGLSurface aPresentationSurface) Object::LocalRef AndroidBridge::ChannelCreate(Object::Param stream) { JNIEnv* const env = GetEnvForThread(); auto rv = Object::LocalRef::Adopt(env, env->CallStaticObjectMethod( - sBridge->jReadableByteChannel, sBridge->jChannelCreate, stream.Get())); + sBridge->jChannels, sBridge->jChannelCreate, stream.Get())); HandleUncaughtException(env); return rv; }