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

Commit 21003bba authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Hold Call displayed for few seconds after Con. call connected"

parents 39b22f4a b81d15be

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

+8 −5
Original line number Diff line number Diff line
@@ -1392,13 +1392,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: