From 3da79c33453f90dea4fbd2d17488bca03e4922f1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 09:20:10 -0800 Subject: [PATCH 01/12] 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/3d467f400b90 Author: Hubert Figuière Desc: Merge pull request #15699 from hfiguiere/bug962040-fixes Bug 962040 - Require marionette-device-host 0.0.2 to avoid spurious stdout output r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/fb8823dd0489 Author: Hubert Figuière Desc: Bug 962040 - Require marionette-device-host 0.0.2 to avoid spurious stdout output --- 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 e49fb8195bf..a7bb6a508a0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0284cd20f5348574b2bbd224ceacc9fb5e5d33da", + "revision": "3d467f400b90c2956255041ff72e2991c20ef020", "repo_path": "/integration/gaia-central" } From 4846ddcd165e8cbf26f211a057ceae571fae3683 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 09:25:57 -0800 Subject: [PATCH 02/12] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3308369b6c1..49c15936af7 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index e11df394278..08084683934 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 3308369b6c1..49c15936af7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index dfca9e65686..e1ca7f025e9 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 29befdabf9c..dba4e6c8e76 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 04bff19fed2..89110611486 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index c6041cb1f14..af05217e88f 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index e1b6b85b62b..b56aedd8c48 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 54733b0cc6f..ac785ce7d75 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 8b8f570ccc2aa6d0bee29e5f4cbb2fdfff806879 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 18:30:11 -0800 Subject: [PATCH 03/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0febdd7dec10 Author: John Hu Desc: Merge pull request #15609 from punamdahiya/Bug962639 Bug962639 - [Gallery] Fix of Select a picture and change orientation to landscape shows parts of previous and next picture r=johnhu ======== https://hg.mozilla.org/integration/gaia-central/rev/ad9539b99be9 Author: Punam Dahiya Desc: Bug962639 - [Gallery] Fix of Select a picture and change orientation to landscape shows parts of previous and next picture r=johnhu --- 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 a7bb6a508a0..7447439cd23 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "3d467f400b90c2956255041ff72e2991c20ef020", + "revision": "0febdd7dec1040266f2398070915592f1e9215f1", "repo_path": "/integration/gaia-central" } From a0c6469cb3891763fe319a0aec9f2f5374bf7603 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 18:35:59 -0800 Subject: [PATCH 04/12] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 49c15936af7..4ad079e535a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 08084683934..43c54c8ca07 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 49c15936af7..4ad079e535a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index e1ca7f025e9..92d432edf8f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index dba4e6c8e76..63222ade12a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 89110611486..915ae19fe10 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index af05217e88f..60bcf753631 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index b56aedd8c48..af504faed57 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index ac785ce7d75..5e745b59982 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 9c0ca8a36e5b582cc65e02848db48cd8cc44d07d Mon Sep 17 00:00:00 2001 From: "\"allstars.chh\"" Date: Sat, 18 Jan 2014 17:20:26 +0100 Subject: [PATCH 05/12] Bug 951177 - Part 1: removal of anr and email. r=vicamo --- dom/system/gonk/ril_worker.js | 27 ++++++++++---------- dom/system/gonk/tests/test_ril_worker_icc.js | 4 ++- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js index 01cf79178eb..49e1f537218 100644 --- a/dom/system/gonk/ril_worker.js +++ b/dom/system/gonk/ril_worker.js @@ -13735,15 +13735,6 @@ let ICCContactHelper = { return; } - // Check if contact has additional properties (email, anr, ...etc) that - // need to be updated as well. - if ((field === USIM_PBR_EMAIL && !contact.email) || - (field === USIM_PBR_ANR0 && (!Array.isArray(contact.anr) || - !contact.anr[0]))) { - updateField(); - return; - } - ICCContactHelper.updateContactField(pbr, contact, field, updateField, onerror); })(); }, @@ -13783,7 +13774,8 @@ let ICCContactHelper = { if (field === USIM_PBR_EMAIL) { ICCRecordHelper.updateEmail(pbr, contact.recordId, contact.email, null, onsuccess, onerror); } else if (field === USIM_PBR_ANR0) { - ICCRecordHelper.updateANR(pbr, contact.recordId, contact.anr[0], null, onsuccess, onerror); + let anr = Array.isArray(contact.anr) ? contact.anr[0] : null; + ICCRecordHelper.updateANR(pbr, contact.recordId, anr, null, onsuccess, onerror); } else { if (DEBUG) { debug("Unsupported field :" + field); @@ -13813,8 +13805,16 @@ let ICCContactHelper = { let gotIapCb = function gotIapCb(iap) { let recordId = iap[pbr[field].indexInIAP]; if (recordId === 0xff) { - // Case 1. - this.addContactFieldType2(pbr, contact, field, onsuccess, onerror); + // If the value in IAP[index] is 0xff, which means the contact stored on + // the SIM doesn't have the additional attribute (email or anr). + // So if the contact to be updated doesn't have the attribute either, + // we don't have to update it. + if ((field === USIM_PBR_EMAIL && contact.email) || + (field === USIM_PBR_ANR0 && + (Array.isArray(contact.anr) && contact.anr[0]))) { + // Case 1. + this.addContactFieldType2(pbr, contact, field, onsuccess, onerror); + } return; } @@ -13822,7 +13822,8 @@ let ICCContactHelper = { if (field === USIM_PBR_EMAIL) { ICCRecordHelper.updateEmail(pbr, recordId, contact.email, contact.recordId, onsuccess, onerror); } else if (field === USIM_PBR_ANR0) { - ICCRecordHelper.updateANR(pbr, recordId, contact.anr[0], contact.recordId, onsuccess, onerror); + let anr = Array.isArray(contact.anr) ? contact.anr[0] : null; + ICCRecordHelper.updateANR(pbr, recordId, anr, contact.recordId, onsuccess, onerror); } else { if (DEBUG) { debug("Unsupported field :" + field); diff --git a/dom/system/gonk/tests/test_ril_worker_icc.js b/dom/system/gonk/tests/test_ril_worker_icc.js index a1d445a1c23..8e67848f862 100644 --- a/dom/system/gonk/tests/test_ril_worker_icc.js +++ b/dom/system/gonk/tests/test_ril_worker_icc.js @@ -1702,7 +1702,9 @@ add_test(function test_update_icc_contact() { } else if (pbr.anr0.fileType === ICC_USIM_TYPE2_TAG) { do_check_eq(recordNumber, ANR0_RECORD_ID); } - do_check_eq(number, aContact.anr[0]); + if (Array.isArray(aContact.anr)) { + do_check_eq(number, aContact.anr[0]); + } onsuccess(); }; From 014f12a89c47702c1c6efb0fb452078b1ba08700 Mon Sep 17 00:00:00 2001 From: "\"allstars.chh\"" Date: Tue, 21 Jan 2014 12:01:37 +0100 Subject: [PATCH 06/12] Bug 951177 - Part 2: xpcshell for removal. r=vicamo --- dom/system/gonk/tests/test_ril_worker_icc.js | 80 ++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dom/system/gonk/tests/test_ril_worker_icc.js b/dom/system/gonk/tests/test_ril_worker_icc.js index 8e67848f862..d767f2615fd 100644 --- a/dom/system/gonk/tests/test_ril_worker_icc.js +++ b/dom/system/gonk/tests/test_ril_worker_icc.js @@ -1773,6 +1773,86 @@ add_test(function test_update_icc_contact() { run_next_test(); }); +/** + * Verify updateICCContact with removal of anr and email with File Type 1. + */ +add_test(function test_update_icc_contact_with_remove_type1_attr() { + const ADN_RECORD_ID = 100; + const IAP_FILE_ID = 0x4f17; + const EMAIL_FILE_ID = 0x4f50; + const EMAIL_RECORD_ID = 20; + const ANR0_FILE_ID = 0x4f11; + const ANR0_RECORD_ID = 30; + + let worker = newUint8Worker(); + let recordHelper = worker.ICCRecordHelper; + let contactHelper = worker.ICCContactHelper; + + recordHelper.updateADNLike = function(fileId, contact, pin2, onsuccess, onerror) { + onsuccess(); + }; + + let contact = { + pbrIndex: 0, + recordId: ADN_RECORD_ID, + alphaId: "test2", + number: "123456", + }; + + recordHelper.readIAP = function(fileId, recordNumber, onsuccess, onerror) { + onsuccess([EMAIL_RECORD_ID, ANR0_RECORD_ID]); + }; + + recordHelper.updateEmail = function(pbr, recordNumber, email, adnRecordId, onsuccess, onerror) { + do_check_true(email == null); + onsuccess(); + }; + + recordHelper.updateANR = function(pbr, recordNumber, number, adnRecordId, onsuccess, onerror) { + do_check_true(number == null); + onsuccess(); + }; + + function do_test(type) { + recordHelper.readPBR = function(onsuccess, onerror) { + if (type == ICC_USIM_TYPE1_TAG) { + onsuccess([{ + adn: {fileId: ICC_EF_ADN}, + email: {fileId: EMAIL_FILE_ID, + fileType: ICC_USIM_TYPE1_TAG}, + anr0: {fileId: ANR0_FILE_ID, + fileType: ICC_USIM_TYPE1_TAG}}]); + } else { + onsuccess([{ + adn: {fileId: ICC_EF_ADN}, + iap: {fileId: IAP_FILE_ID}, + email: {fileId: EMAIL_FILE_ID, + fileType: ICC_USIM_TYPE2_TAG, + indexInIAP: 0}, + anr0: {fileId: ANR0_FILE_ID, + fileType: ICC_USIM_TYPE2_TAG, + indexInIAP: 1}}]); + } + }; + + let successCb = function() { + do_check_true(true); + }; + + let errorCb = function(errorMsg) { + do_print(errorMsg); + do_check_true(false); + }; + + contactHelper.updateICCContact(CARD_APPTYPE_USIM, "adn", contact, null, successCb, errorCb); + } + + do_test(ICC_USIM_TYPE1_TAG); + do_test(ICC_USIM_TYPE2_TAG); + + run_next_test(); +}); + /** * Verify ICCContactHelper.findFreeICCContact in SIM */ From 305a1ff4b2e58576f9253f2696bcfbec6ef94b1d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 20:20:12 -0800 Subject: [PATCH 07/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b6246e059f4f Author: Arthur Chen Desc: Merge pull request #15551 from waynux/issue936398 Bug 936398 - [Settings] Title wording r=crh0716 ======== https://hg.mozilla.org/integration/gaia-central/rev/bcb5412c36d1 Author: Tzu-Wen Lin Desc: Bug 936398 - [Settings] Title wordings --- 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 7447439cd23..d34cf4d4603 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0febdd7dec1040266f2398070915592f1e9215f1", + "revision": "b6246e059f4fc5001ee426f84d38ce05c2aabc7e", "repo_path": "/integration/gaia-central" } From 282dfb3093e5bd7651b97ae43b67ab597bd58aca Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 20:27:25 -0800 Subject: [PATCH 08/12] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4ad079e535a..059b176f235 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 43c54c8ca07..8072e2b772f 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 4ad079e535a..059b176f235 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 92d432edf8f..25f3adba13c 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 63222ade12a..ff7147cecf4 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 915ae19fe10..91a4d3df52f 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 60bcf753631..e5551f1bb3c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index af504faed57..61db735de91 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 5e745b59982..4f98a9f7c1a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 568509a23cabd3fa271b848a6dd88e9331ebb5ba Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 23:15:13 -0800 Subject: [PATCH 09/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f1f38950dbdf Author: gitmai Desc: Merge pull request #15457 from gitmai/bug-960103-javascript-warning-views-fisttime_css Bug 960103 - Javascript Warning. Error in parsing value for background. ... r=salva ======== https://hg.mozilla.org/integration/gaia-central/rev/998b4d2764cb Author: mai Desc: Bug 960103 - Javascript Warning. Error in parsing value for background. Declaration dropped. {file: firsttime.css --- 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 d34cf4d4603..28c62ca3c6f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b6246e059f4fc5001ee426f84d38ce05c2aabc7e", + "revision": "f1f38950dbdf93971dd1ca85d4186b48afd87dbe", "repo_path": "/integration/gaia-central" } From c53629c75f6d830bf63b23c55329eeb850014f08 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 23:21:06 -0800 Subject: [PATCH 10/12] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 059b176f235..fe69b823aa5 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 8072e2b772f..4fe514986c3 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 059b176f235..fe69b823aa5 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 25f3adba13c..a945a80a2f0 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index ff7147cecf4..a1a9a5d01f8 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 91a4d3df52f..48c740647cd 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index e5551f1bb3c..acd77c91c99 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 61db735de91..7c5971bebab 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 4f98a9f7c1a..1646f15a5d7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 55f51f61d8eb9a7da7402c23d4be7d186f35a07c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 23:30:11 -0800 Subject: [PATCH 11/12] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c5f8db7e1e71 Author: gitmai Desc: Merge pull request #15555 from gitmai/bug-961742-CC-VIVO-cfg-not-detect-only-one-decimal Bug 961742 -[Cost Control] Check balance with Brazil VIVO prepaid SIM ca.. r=salva ======== https://hg.mozilla.org/integration/gaia-central/rev/c084b4c0cebd Author: mai Desc: Bug 961742 -[Cost Control] Check balance with Brazil VIVO prepaid SIM card is not detected if it only has a decimal digit --- 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 28c62ca3c6f..a8ab2313c1f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f1f38950dbdf93971dd1ca85d4186b48afd87dbe", + "revision": "c5f8db7e1e71a9bfe0d29665d2b4cf3ae773094e", "repo_path": "/integration/gaia-central" } From 9f19ad9e70664c94099a144caaed4b26ce192c6e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 26 Jan 2014 23:30:56 -0800 Subject: [PATCH 12/12] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fe69b823aa5..9fb66a41996 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4fe514986c3..f509e52d18f 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index fe69b823aa5..9fb66a41996 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a945a80a2f0..712a839abb1 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index a1a9a5d01f8..351a0b2ea9d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 48c740647cd..ef1f1fd5156 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index acd77c91c99..18c19467428 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 7c5971bebab..47ee9085254 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1646f15a5d7..d21d4c160df 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - +