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

Commit aff3bf64 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix to display merge icon on failure."

parents f2d84cc5 7197af8d

src/java/com/android/internal/telephony/gsm/GsmCallTracker.java

100755 → 100644
+13 −1
Original line number Diff line number Diff line
@@ -923,8 +923,20 @@ public final class GsmCallTracker extends CallTracker { 
                operationComplete();

            break;



            case EVENT_SWITCH_RESULT:

            case EVENT_CONFERENCE_RESULT:

                ar = (AsyncResult)msg.obj;

                if (ar.exception != null) {

                    mPhone.notifySuppServiceFailed(getFailedService(msg.what));

                    List<Connection> conn = mForegroundCall.getConnections();

                    if (conn != null) {

                        Rlog.d(LOG_TAG, "Notify merge failure");

                        conn.get(0).onConferenceMergeFailed();

                    }

                }

                operationComplete();

            break;



            case EVENT_SWITCH_RESULT:

            case EVENT_SEPARATE_RESULT:

            case EVENT_ECT_RESULT:

                ar = (AsyncResult)msg.obj;