| commit | 6c85d10e604e4b42b86c4ba6468a0c1a0f06b3bb | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Oct 16 10:51:08 2015 -0700 |
| committer | Santos Cordon <santoscordon@google.com> | Fri Oct 16 18:02:03 2015 +0000 |
| tree | 783ac4e3444fb97fc5ff0783dd3e148a08e73608 | |
| parent | 67c3279ef96d40cdef4f203f33044affc168a502 [diff] |
DO NOT MERGE Double-check SIP state before issuing a swap-calls command. Our code relied on the state of SipConnection to prevent us from holding a HELD call and unholding an ACTIVE call. However, while the action is in progress, the SipConnection state can be slightly delayed so we double-check the internal state of the lower connection prior to issuing a switchHoldingAndActive command. Bug: 24007856 Change-Id: I617ef215e66f6b9324dc17cb1b9832cc35390f17