From 9f372efafeb9dcd653a58a42ce0cf398bc76e050 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 17:56:13 -0700 Subject: [PATCH 01/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fe08cb3ebbe9 Author: Marcus Cavanaugh Desc: Merge pull request #18058 from mcav/gelam-tarako Bug 991567 - [Tarako][Email] Email app is killed while downloading an at... ======== https://hg.mozilla.org/integration/gaia-central/rev/cb33d701f751 Author: Marcus Cavanaugh Desc: Bug 991567 - [Tarako][Email] Email app is killed while downloading an attachment. r=asuth --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 27803c5ab07f..64237a94bf2c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "65cb0c455f058c49aead7de9a245d90aa890276c", + "revision": "fe08cb3ebbe9baca0653187df4c7d50ce9e2fe8e", "repo_path": "/integration/gaia-central" } From 4019412c144dca1e8c874e3b54ae698c5bfb965e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 17:57:52 -0700 Subject: [PATCH 02/17] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b722fe5d6a22..870c09107b24 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 bd8cc343b0f5..42630c6de107 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 ca9c9df7c229..e361dda64a4b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b722fe5d6a22..870c09107b24 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 72977aa8145c..955c979de9ee 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index afc6997c6602..696f51164c76 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9c892d022906..d05148f6cde7 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a67df032230d..b261ae25aab7 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index c42b1867f7c4..57e13067ce6b 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index d0ace118a4c9..8cecfcdd86ec 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 4f4d83a74eac..600ce248ce83 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 48a03aa8f51738d943564bbc7eba0da40b6dd593 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 18:46:17 -0700 Subject: [PATCH 03/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/aed1eb065c43 Author: Yuren Ju Desc: Merge pull request #18019 from yurenju/maxBuffer Bug 992773 - maxBuffer for child_process.exec is exceeded in |make build... r=@cctuan ======== https://hg.mozilla.org/integration/gaia-central/rev/7d0c35d4db39 Author: Yuren Ju Desc: Bug 992773 - maxBuffer for child_process.exec is exceeded in |make build-test-integration| --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 64237a94bf2c..c10e95e6466e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "fe08cb3ebbe9baca0653187df4c7d50ce9e2fe8e", + "revision": "aed1eb065c435efafc445df60f2dfe47ebcef1e4", "repo_path": "/integration/gaia-central" } From 4a1ca3853f576d999dd49d85471556f2685baa4c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 18:51:35 -0700 Subject: [PATCH 04/17] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 870c09107b24..6d43b2a2b59e 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 42630c6de107..9e0f9e58057b 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 e361dda64a4b..34e4319b31e3 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 870c09107b24..6d43b2a2b59e 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 955c979de9ee..4d0e4c3e6232 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 696f51164c76..f2b3d83139ed 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index d05148f6cde7..7609fd2b011b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index b261ae25aab7..b9d5fe5ffdb2 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 57e13067ce6b..c93d2ad425b8 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 8cecfcdd86ec..9efd57fa4fd2 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 600ce248ce83..7b59abb219a0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c3e72583370feba0f2f323191b19a987301ce60d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 19:01:12 -0700 Subject: [PATCH 05/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7685bf4c4968 Author: steveck-chung Desc: Merge pull request #17630 from steveck-chung/bug-983631 Bug 983631 - [Messages] After deleting a message thread the notification persists forever. r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/b9986a0e8c20 Author: Steve Chung Desc: Bug 983631 - [Messages] After deleting a message thread the notification persists forever. * Add closeNotificationsForThread api and make it return as promise * Apply julien's promise-based test case --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c10e95e6466e..9286b2092e85 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "aed1eb065c435efafc445df60f2dfe47ebcef1e4", + "revision": "7685bf4c496833ad4544a95b59717167fb832f40", "repo_path": "/integration/gaia-central" } From a2e37f2e0459ed5d587a3bba90106c1bfbffc30c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 19:02:49 -0700 Subject: [PATCH 06/17] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6d43b2a2b59e..bfa9a31d316d 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 9e0f9e58057b..355ba4d99712 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 34e4319b31e3..6c1f8b5a9323 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 6d43b2a2b59e..bfa9a31d316d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 4d0e4c3e6232..28955b796528 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f2b3d83139ed..1d9469665e03 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 7609fd2b011b..3d0953615746 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index b9d5fe5ffdb2..a0ef6c565c81 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index c93d2ad425b8..e8eabe781415 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 9efd57fa4fd2..921b1328dd7d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 7b59abb219a0..33bad71c9f47 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 4bbb82e620ab019d435199e0dfb2ff064d3e5d62 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 21:01:11 -0700 Subject: [PATCH 07/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ee2b3048ba1e Author: Marcus Cavanaugh Desc: Merge pull request #17950 from mcav/stopwatch-l10n Bug 988057 - [Stopwatch][l10n] Localization of stopwatch is broken. r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/1ce72ce5ed12 Author: Marcus Cavanaugh Desc: Bug 988057 - [Stopwatch][l10n] Localization of stopwatch is broken. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9286b2092e85..b405245d3b86 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "7685bf4c496833ad4544a95b59717167fb832f40", + "revision": "ee2b3048ba1e4c2bd65c0857d4a1a938ca338163", "repo_path": "/integration/gaia-central" } From 03a2efcbe21bf8b1c931d3bd93b3ef23246fc668 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 21:06:25 -0700 Subject: [PATCH 08/17] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index bfa9a31d316d..c7f287193e93 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 355ba4d99712..deb1b1c1a04c 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 6c1f8b5a9323..841f450249fd 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index bfa9a31d316d..c7f287193e93 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 28955b796528..fbb34e37b04c 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 1d9469665e03..41905c4d737b 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 3d0953615746..3ee3f22c1a0e 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a0ef6c565c81..d5b25610c63e 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index e8eabe781415..04a239f79a82 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 921b1328dd7d..c7af1187c59b 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 33bad71c9f47..a0e3c2029168 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c34f95c600b9384bdde48e78c778b45769da3b15 Mon Sep 17 00:00:00 2001 From: Bevis Tseng Date: Thu, 3 Apr 2014 16:33:56 +0800 Subject: [PATCH 09/17] Bug 990918 - Part 1: Make RIL compatible for both new/old formats of ril.cellbroadcast.searchlist. r=htsai --- dom/system/gonk/RadioInterfaceLayer.js | 22 ++++++++++++++-------- dom/system/gonk/ril_worker.js | 13 ++++++++++++- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index d8fcefaeb0b2..38eb5d34069a 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -2512,20 +2512,23 @@ RadioInterface.prototype = { }).bind(this)); }, - setCellBroadcastSearchList: function(newSearchListStr) { - if (newSearchListStr == this._cellBroadcastSearchListStr) { + setCellBroadcastSearchList: function(newSearchList) { + if ((newSearchList == this._cellBroadcastSearchList) || + (newSearchList && this._cellBroadcastSearchList && + newSearchList.gsm == this._cellBroadcastSearchList.gsm && + newSearchList.cdma == this._cellBroadcastSearchList.cdma)) { return; } this.workerMessenger.send("setCellBroadcastSearchList", - { searchListStr: newSearchListStr }, + { searchList: newSearchList }, (function callback(response) { if (!response.success) { let lock = gSettingsService.createLock(); lock.set(kSettingsCellBroadcastSearchList, - this._cellBroadcastSearchListStr, null); + this._cellBroadcastSearchList, null); } else { - this._cellBroadcastSearchListStr = response.searchListStr; + this._cellBroadcastSearchList = response.searchList; } return false; @@ -3384,7 +3387,7 @@ RadioInterface.prototype = { _sntp: null, // Cell Broadcast settings values. - _cellBroadcastSearchListStr: null, + _cellBroadcastSearchList: null, // Operator's mcc-mnc. _lastKnownNetwork: null, @@ -3471,9 +3474,12 @@ RadioInterface.prototype = { break; case kSettingsCellBroadcastSearchList: if (DEBUG) { - this.debug("'" + kSettingsCellBroadcastSearchList + "' is now " + aResult); + this.debug("'" + kSettingsCellBroadcastSearchList + + "' is now " + JSON.stringify(aResult)); } - this.setCellBroadcastSearchList(aResult); + // TODO: Set searchlist for Multi-SIM. See Bug 921326. + let result = Array.isArray(aResult) ? aResult[0] : aResult; + this.setCellBroadcastSearchList(result); break; } }, diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 8d0ff0afb9e4..bb29bc4b28b8 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -1832,8 +1832,19 @@ RilObject.prototype = { }, setCellBroadcastSearchList: function(options) { + let getSearchListStr = function(aSearchList) { + if (typeof aSearchList === "string" || aSearchList instanceof String) { + return aSearchList; + } + + // TODO: Set search list for CDMA/GSM individually. Bug 990926 + let prop = this._isCdma ? "cdma" : "gsm"; + + return aSearchList && aSearchList[prop]; + }.bind(this); + try { - let str = options.searchListStr; + let str = getSearchListStr(options.searchList); this.cellBroadcastConfigs.MMI = this._convertCellBroadcastSearchList(str); options.success = true; } catch (e) { From e88732c44c5e6b87e856c180f6633c7346120406 Mon Sep 17 00:00:00 2001 From: Bevis Tseng Date: Thu, 3 Apr 2014 16:46:51 +0800 Subject: [PATCH 10/17] Bug 990918 - Part 2: Add Xpcshell Test Case for setCellBroadcastSearchList(). r=htsai --- .../test_ril_worker_cellbroadcast_config.js | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js b/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js index d782860c8d19..3f20e8708c74 100644 --- a/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js +++ b/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js @@ -137,3 +137,37 @@ add_test(function test_ril_worker_cellbroadcast_merge_config() { run_next_test(); }); +add_test(function test_ril_worker_cellbroadcast_set_search_list() { + let worker = newWorker({ + postRILMessage: function(id, parcel) { + // Do nothing + }, + postMessage: function(message) { + // Do nothing + } + }); + + let context = worker.ContextPool._contexts[0]; + + function test(aIsCdma, aSearchList, aExpected) { + context.RIL._isCdma = aIsCdma; + + let options = { searchList: aSearchList }; + context.RIL.setCellBroadcastSearchList(options); + // Enforce the MMI result to string for comparison. + do_check_eq("" + context.RIL.cellBroadcastConfigs.MMI, aExpected); + do_check_eq(options.success, true); + } + + let searchListStr = "1,2,3,4"; + let searchList = { gsm: "1,2,3,4", cdma: "5,6,7,8" }; + + test(false, searchListStr, "1,2,2,3,3,4,4,5"); + test(true, searchListStr, "1,2,2,3,3,4,4,5"); + test(false, searchList, "1,2,2,3,3,4,4,5"); + test(true, searchList, "5,6,6,7,7,8,8,9"); + test(false, null, "null"); + test(true, null, "null"); + + run_next_test(); +}); From 3a6a117e75c6ccbf19820f994fafd60868d4fa7c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 7 Apr 2014 23:22:43 -0700 Subject: [PATCH 11/17] Bumping manifests a=b2g-bump --- b2g/config/emulator-kk/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 841f450249fd..08747a53d5fd 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -12,7 +12,7 @@ - + From f7a9248506f259d8fecab76b26c5e10a22d728d4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 8 Apr 2014 00:11:10 -0700 Subject: [PATCH 12/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/451250fa7e7c Author: Arnau Desc: Merge pull request #17952 from rnowm/989933 Bug 989933 - Create green themed header [BB] for comms apps r=pivanov ======== https://hg.mozilla.org/integration/gaia-central/rev/08ef8aad0ec8 Author: rnowm Desc: Bug 989933 - Create green themed header [BB] for comms apps --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b405245d3b86..df664e8a4ffd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "ee2b3048ba1e4c2bd65c0857d4a1a938ca338163", + "revision": "451250fa7e7c1b044f295897fd71da048a4a8c47", "repo_path": "/integration/gaia-central" } From 729a7800e123855d816a3a4d3dbc579928b601ba Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 8 Apr 2014 00:16:32 -0700 Subject: [PATCH 13/17] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c7f287193e93..eb6f4f6dc1f3 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 deb1b1c1a04c..c21f7a19b185 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 08747a53d5fd..c66f4ee45e26 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c7f287193e93..eb6f4f6dc1f3 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index fbb34e37b04c..6bf38b5f1787 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 41905c4d737b..69c9050518d8 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 3ee3f22c1a0e..c104148ce15a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index d5b25610c63e..5f95794245ab 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 04a239f79a82..50c07e51ac5b 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index c7af1187c59b..86394edbbf54 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index a0e3c2029168..a0ba5c274ffa 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From f6123e2f1301434bcd9145c5d3ed1f8dd8bea9e8 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 8 Apr 2014 09:27:47 +0200 Subject: [PATCH 14/17] Bug 981239: Use atomic ref-counting for |UnixSocketConsumer|, r=kyle |SocketSendTask| acquires a reference to |UnixSocketConsumer| on the main thread and releases this reference on the I/O thread; leading to race-conditions. This patch adds - atomicity for ref-counting of |UnixSocketConsumer|, and - stricter tests in the destructor of this class. --- ipc/unixsocket/UnixSocket.cpp | 2 ++ ipc/unixsocket/UnixSocket.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp index 6bcc2cc5fe29..ca9578a3d490 100644 --- a/ipc/unixsocket/UnixSocket.cpp +++ b/ipc/unixsocket/UnixSocket.cpp @@ -739,6 +739,8 @@ UnixSocketConsumer::UnixSocketConsumer() : mImpl(nullptr) UnixSocketConsumer::~UnixSocketConsumer() { + MOZ_ASSERT(mConnectionStatus == SOCKET_DISCONNECTED); + MOZ_ASSERT(!mImpl); } bool diff --git a/ipc/unixsocket/UnixSocket.h b/ipc/unixsocket/UnixSocket.h index 3d08c02b85c9..46b3553803f2 100644 --- a/ipc/unixsocket/UnixSocket.h +++ b/ipc/unixsocket/UnixSocket.h @@ -135,7 +135,7 @@ enum SocketConnectionStatus { SOCKET_CONNECTED = 3 }; -class UnixSocketConsumer : public RefCounted +class UnixSocketConsumer : public AtomicRefCounted { public: MOZ_DECLARE_REFCOUNTED_TYPENAME(UnixSocketConsumer) From b1a0dca697298f13e4126f3617bc7a5cf42a21fd Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Tue, 8 Apr 2014 09:30:58 +0200 Subject: [PATCH 15/17] Bug 990984: Explicitly close socket file descriptor, r=kyle Closing the socket explicitly will make UnixSocket fail if we're trying to read or write afterwards; indicating potential bugs. --- ipc/unixsocket/UnixSocket.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp index ca9578a3d490..be23891ddd0d 100644 --- a/ipc/unixsocket/UnixSocket.cpp +++ b/ipc/unixsocket/UnixSocket.cpp @@ -64,8 +64,7 @@ public: MOZ_ASSERT(!NS_IsMainThread()); MOZ_ASSERT(!mShuttingDownOnIOThread); - RemoveWatchers(READ_WATCHER|WRITE_WATCHER); - + Close(); // will also remove fd from I/O loop mShuttingDownOnIOThread = true; } @@ -643,7 +642,7 @@ void UnixSocketImpl::OnSocketCanReceiveWithoutBlocking() { MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop()); - MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTED); + MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTED); // see bug 990984 // Read all of the incoming data. while (true) { @@ -691,7 +690,7 @@ void UnixSocketImpl::OnSocketCanSendWithoutBlocking() { MOZ_ASSERT(MessageLoopForIO::current() == GetIOLoop()); - MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTED); + MOZ_ASSERT(GetConnectionStatus() == SOCKET_IS_CONNECTED); // see bug 990984 // Try to write the bytes of mCurrentRilRawData. If all were written, continue. // From 5fa84f13499101f110205de0be72329a36a257af Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 8 Apr 2014 00:36:33 -0700 Subject: [PATCH 16/17] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/82aa7db46a22 Author: Rudy Lu Desc: Merge pull request #17629 from RudyLu/keyboard/Bug956175-switch_language Bug 956175 - [keyboard refactor] handle language switching. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/2a7bb3d14e82 Author: Rudy Lu Desc: Bug 956175 - [keyboard refactor] handle language switching. - Add KeyboardLayoutManager, load layout definition file dynamically. - Change the format of layout definition from js to json. - Add unit tests. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index df664e8a4ffd..c9de47d7f9b6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "451250fa7e7c1b044f295897fd71da048a4a8c47", + "revision": "82aa7db46a22bc99998468aa433eafb33d739ed6", "repo_path": "/integration/gaia-central" } From 2944adf14a06ca4b97cfdf11519b1b83a972a84d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 8 Apr 2014 00:41:24 -0700 Subject: [PATCH 17/17] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index eb6f4f6dc1f3..2c6d21987c03 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 c21f7a19b185..6b2f0cc64ae9 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 c66f4ee45e26..d78008501632 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index eb6f4f6dc1f3..2c6d21987c03 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 6bf38b5f1787..2c5b3437fa5a 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 69c9050518d8..8ff1f01f73c9 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index c104148ce15a..97609c31e223 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 5f95794245ab..2ba9d465959d 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 50c07e51ac5b..c63af70f59a6 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 86394edbbf54..75fcada64b54 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index a0ba5c274ffa..47e556f49aff 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +