Bug 988677 fixed a bug in the Marketplace package which incorrectly detected MCC/MNC. We should get that into 1.3T. I think cvan makes these so assigning to him for now. We should probably wait for bug 988677 to be verified before we land this for real

We need that on all releases that target DSDS, which is >= 1.3 So let's land on master, and ask for 1.3 blocking (this needs to be on 1.4 too!)

Julien, hi there - you had reviewed one of my Marketplace patches a while back. This is a simple change to our package, and if Fabrice can't take take a look at it, it'd be awesome if you could take a look. Thank you!

Comment on attachment 8399809 [details] Fix MCC/MNC dual SIM detection in Marketplace app r=me checked the 2 ETags and the application, looks identical :) I'm removing fabrice's request because he's in PTO and this looks to be urgent.

Thanks Julien. What are the next steps here? Can you land the patch and close this bug?

I restarted Travis to try to have a green run, and then I can merge myself yep. Adding a needinfo for now.

Moved into Gaia just cause for the need for status flag tracking.

master: 5d81c713215ee1b97996e0bedff87dcd14309eec

Please request approval-gaia-v1.3 on this when you feel it's ready for uplift.

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #8) > Please request approval-gaia-v1.3 on this when you feel it's ready for > uplift. jsmith can you request that bit, please?

Comment on attachment 8399809 [details] Fix MCC/MNC dual SIM detection in Marketplace app NOTE: Please see https://wiki.mozilla.org/Release_Management/B2G_Landing to better understand the B2G approval process and landings. [Approval Request Comment] [Bug caused by] (feature/regressing bug #): bug 988677 [User impact] if declined: Incorrect detection of MCC/MNC in marketplace package. [Testing completed]: QA verified by Krupa that MCC/MNC are correct with a DSDS device [Risk to taking this patch] (and alternatives if risky): Low - the patch just updates the marketplace package to the latest one available hosted on marketplace with the MCC/MNC detection issue fixed. [String changes made]: None

I'm not entirely sure how to get this uplifted to v1.3/v1.4.

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #11) > I'm not entirely sure how to get this uplifted to v1.3/v1.4. https://github.com/mozilla-b2g/gaia/commit/5d81c713215ee1b97996e0bedff87dcd14309eec is the commit that needs to go in, that's all. Did you need something else?

Yeah, it doesn't apply.

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #13) > Yeah, it doesn't apply. https://github.com/mozilla-b2g/gaia/commit/d1c10c8bbae0d81403dde107f6b6285c073da009 is the parent commit, and that's the only change we need.

What Ryan is asking for here is he asking for a branch-specific patch of the same commit you generated for master. So all we need to do here is build the same exact patch for the 1.3 branch, 1.3T branch, and 1.4 branch.

(In reply to Jason Smith [:jsmith] from comment #15) > What Ryan is asking for here is he asking for a branch-specific patch of the > same commit you generated for master. So all we need to do here is build the > same exact patch for the 1.3 branch, 1.3T branch, and 1.4 branch. Can someone with commit privileges do that? Julien?

Chris, if you can send PR for the other branches I'll merge them.

Hey Christopher, can you have a look and check the package looks good? I used -Xtheirs as a conflict resolver and took care to add the "origin" line back that was removed in bug 929602.

Same for the v1.4 branch, except the "origin" line was already removed this time :)

Christopher, can you please have a look to these pull requests?

Fabrice, feel free to merge if this looks good, I'd like someone to double check.

(In reply to Julien Wajsberg [:julienw] from comment #20) > Christopher, can you please have a look to these pull requests? Thank you, looks correct r+

Comment on attachment 8403140 [details] v1.4 pull request It's not clear to me if we need an approval to land on v1.4 for 1.3+ issues, and I checked the B2G landing page ;) See comment 10 for the 1.3 approval request.

v1.3: 0182614ee33d1e274e97c08981157c0b97a5ba9e

Comment on attachment 8403140 [details] v1.4 pull request from comment 22

Comment on attachment 8403139 [details] V1.3 pull request from comment 22

Comment on attachment 8403140 [details] v1.4 pull request 1.3 blockers don't need approval to land on v1.4, per the landing guidelines. Please take some time to read them over and bookmark them for future reference. https://wiki.mozilla.org/Release_Management/B2G_Landing#Landing_Procedure_3 v1.4: https://github.com/mozilla-b2g/gaia/commit/8b8796a0d8adfd163fd72afa796f92c2947e1c67

yeah, I've read them carefully but I missed the part "uplift to: 1.4/aurora" that's in the v1.3 part... I think there should be a line about this in the v1.4 part as well. Bhavana, what do you think? Ryan, thanks for merging!

(In reply to Julien Wajsberg [:julienw] from comment #28) > yeah, I've read them carefully but I missed the part "uplift to: 1.4/aurora" > that's in the v1.3 part... I think there should be a line about this in the > v1.4 part as well. Bhavana, what do you think? > > Ryan, thanks for merging! :julienw, updated the 1.4 section of the wiki for better understanding. Hope that helps.