Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b81d15be authored by Prasath Balakrishnan's avatar Prasath Balakrishnan Committed by Brad Ebinger
Browse files

Hold Call displayed for few seconds after Con. call connected 

When two calls are merged to form a Conference call, Secondary info
is displaying the HOLD call in the UI. This was due wrongly handling
the successful call conference state. Fix is to handle failure case only
if call conference request returns with a exception else conference is
successful

Bug: 36497551
Test: Manual
Change-Id: I387eed3ca02af86bd1a32bc3afe0ff348efb546c
parent a929fd25

src/java/com/android/internal/telephony/GsmCdmaCallTracker.java

+8 −5
Original line number Diff line number Diff line
@@ -1341,13 +1341,16 @@ public class GsmCdmaCallTracker extends CallTracker { 


            case EVENT_CONFERENCE_RESULT:

                if (isPhoneTypeGsm()) {

                    // The conference merge failed, so notify listeners.  Ultimately this bubbles up

                    // to Telecom, which will inform the InCall UI of the failure.

                    ar = (AsyncResult) msg.obj;

                    if (ar.exception != null) {

                        // The conference merge failed, so notify listeners.  Ultimately this

                        // bubbles up to Telecom, which will inform the InCall UI of the failure.

                        Connection connection = mForegroundCall.getLatestConnection();

                        if (connection != null) {

                            connection.onConferenceMergeFailed();

                        }

                    }

                }

                // fall through

            case EVENT_SEPARATE_RESULT:

            case EVENT_ECT_RESULT: