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

Commit 6e7dca87 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Revert "Support Voice Clear Code for VoLTE" 

This reverts commit d904cc46.

Test: Verify conference call logging manually.
Fixes: 167787852
Reason for revert: Caused regression in conference call logging.

Change-Id: Id397f7128cf50f094639e87dac7363dfdf62efbf
parent d904cc46

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

+0 −7
Original line number Diff line number Diff line
@@ -2456,10 +2456,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                }

            }



            if (conn != null) {

                conn.onRemoteDisconnect(reasonInfo.getExtraMessage());

            }



            if (mHoldSwitchingState == HoldSwapState.SWAPPING_ACTIVE_AND_HELD) {

                if (DBG) {

                    log("onCallTerminated: Call terminated in the midst of Switching " +
@@ -3264,9 +3260,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            callState = Call.State.DIALING;

        }

        int cause = getDisconnectCauseFromReasonInfo(reasonInfo, callState);

        if (conn != null) {

            conn.onRemoteDisconnect(reasonInfo.getExtraMessage());

        }



        processCallStateChange(imsCall, ImsPhoneCall.State.DISCONNECTED, cause);

        mPhone.notifyImsReason(reasonInfo);

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

+1 −9
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ public class ImsPhoneConnection extends Connection implements 
     */

    private boolean mIsMergeInProcess = false;



    private String mVendorCause;



    /**

     * Used as an override to determine whether video is locally available for this call.

     * This allows video availability to be overridden in the case that the modem says video is
@@ -347,7 +345,7 @@ public class ImsPhoneConnection extends Connection implements 


    @Override

    public String getVendorDisconnectCause() {

      return mVendorCause;

      return null;

    }



    @UnsupportedAppUsage
@@ -444,7 +442,6 @@ public class ImsPhoneConnection extends Connection implements 
    void

    onHangupLocal() {

        mCause = DisconnectCause.LOCAL;

        mVendorCause = null;

    }



    /** Called when the connection has been disconnected */
@@ -488,11 +485,6 @@ public class ImsPhoneConnection extends Connection implements 
        return changed;

    }



    void

    onRemoteDisconnect(String vendorCause) {

        this.mVendorCause = vendorCause;

    }



    /**

     * An incoming or outgoing call has connected

     */