1147123 - [CDMA] Cannot merge 3-way call

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::Dialer, defect)

Description

[Michael Schwartz [:m4]]

STR:
# Initiate a MO CDMA call
# Add a new call

Expected: Merge button should be available
Observed: No merge or swap button is available

This is a regression from https://bugzilla.mozilla.org/show_bug.cgi?id=977588#c112

Comment 1

[Johan Lorenzo [:jlorenzo]]

Comms triage: Regression from 2.1 on a use case which will impact CDMA phones

Comment 2

[Gabriele Svelto [:gsvelto]]

Taking this since I'm familiar with the topic.

Comment 3

[Michael Schwartz [:m4]]

According to https://bugzilla.mozilla.org/show_bug.cgi?id=977588#c118 the mergeable/switchable flags from TelephonyCall should be used instead and these checks removed.

Comment 4

[Gabriele Svelto [:gsvelto]]

Working on this.

Comment 5

[GitHub Autolander Bot]

Attachment: [gaia] gabrielesvelto:bug-1147123-cdma-3way-merge > mozilla-b2g:master

Comment 6

[Gabriele Svelto [:gsvelto]]

Comment on attachment 8585765 [details] [review]
[gaia] gabrielesvelto:bug-1147123-cdma-3way-merge > mozilla-b2g:master

I can't test this patch since I don't have a CDMA device available and the emulator doesn't support it yet; but if the telephony code is doing its job properly on real devices this should work.

I've removed tests that didn't make sense anymore and updated the remaining ones.

Comment 7

[Anshul]

M4, could you please test the patch provided by Gabriele.

Comment 8

[Doug Sherk (:drs) (inactive)]

Comment on attachment 8585765 [details] [review]
[gaia] gabrielesvelto:bug-1147123-cdma-3way-merge > mozilla-b2g:master

See my comments on the PR. Would also like to get the results of partner testing before we land this.

Comment 9

[Gabriele Svelto [:gsvelto]]

Comment on attachment 8585765 [details] [review]
[gaia] gabrielesvelto:bug-1147123-cdma-3way-merge > mozilla-b2g:master

Addressed the review comments. I've moved around some tests and added more to better capture the changes I made. I hope this is good enough; I have to ask you to land this for me once it's r+'d and handle the upflit too.

Comment 10

[GitHub Autolander Bot]

Attachment: [gaia] DouglasSherk:bug-1147123-cdma-3way-merge > mozilla-b2g:master

Comment 11

[Doug Sherk (:drs) (inactive)]

Landed in https://github.com/mozilla-b2g/gaia/commit/95ffe46f9cd64b03d8f9bba0ac386942c2966f13
Same code as attachment 8585765 [details] [review], just squashed.
https://treeherder.mozilla.org/#/jobs?repo=gaia&revision=88f4f9f0007d6ff3fee1d63fa058f6100a4b2620

Comment 12

[Doug Sherk (:drs) (inactive)]

Needinfo to request uplift. We should wait for M4's test results first, though.

Comment 13

[Michael Schwartz [:m4]]

I can merge calls with this patch.  I can't add another call once I'm in the conference state (someone has dropped off and I want to call them back) but that's another issue...

Comment 14

[Anshul]

Doug, please uplift this patch to 2.2.

Comment 15

[Doug Sherk (:drs) (inactive)]

Comment on attachment 8585765 [details] [review]
[gaia] gabrielesvelto:bug-1147123-cdma-3way-merge > mozilla-b2g:master

[Approval Request Comment]
[Bug caused by] (feature/regressing bug #): Incomplete functionality from bug 977588.
[User impact] if declined: CDMA users will be unable to merge conference calls into 3-way calls.
[Testing completed]: m4 tried this. See comment 13.
[Risk to taking this patch] (and alternatives if risky): Medium as we can't test this ourselves since it's CDMA-only, and it's a fairly big patch, but there's no real alternative.
[String changes made]: None.

Comment 16

[Anshul]

Bhavana, please get this uplifted to 2.2.

Comment 17

[Ryan VanderMeulen [:RyanVM]]

v2.2: https://github.com/mozilla-b2g/gaia/commit/c36202a8e01e2c250c91c3c64fd2ea81d7c61b98