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

Commit c4fc8b46 authored by rongmei.li's avatar rongmei.li Committed by Michael Bestas
Browse files

Failed to show hold call when user click swap and merge simultaneously 

Set EVENT_MERGE_START for foregroundConnection and backgroundConnection
but don't set EVENT_MERGE_COMPLETE when there is ImsException

Bug: 121105030
Change-Id: I08c189b976227ada1298a864f6f4ba70c4ffb7f9
parent cdf06a84

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+12 −0
Original line number Diff line number Diff line
@@ -1911,6 +1911,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            fgImsCall.merge(bgImsCall);

        } catch (ImsException e) {

            log("conference " + e.getMessage());

            handleConferenceFailed(foregroundConnection, backgroundConnection);

        }

    }
@@ -4896,4 +4897,15 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
    public ArrayList<ImsPhoneConnection> getConnections() {

        return mConnections;

    }



    private void handleConferenceFailed(ImsPhoneConnection fgConnection,

            ImsPhoneConnection bgConnection) {

        if (fgConnection != null) {

            fgConnection.handleMergeComplete();

        }

        if (bgConnection != null) {

            bgConnection.handleMergeComplete();

        }

        mPhone.notifySuppServiceFailed(Phone.SuppService.CONFERENCE);

    }

}