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

Commit e5450cb5 authored by Treehugger Robot's avatar Treehugger Robot Committed by 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.
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1421948

Change-Id: I92165ce6ccfe5bf76893bfb9005e996c32d3839d
(cherry picked from commit 7bdfb240)
parent 75531aea

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

+0 −7
Original line number Diff line number Diff line
@@ -2927,10 +2927,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 " +
@@ -3734,9 +3730,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);

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

+1 −9
Original line number Diff line number Diff line
@@ -124,8 +124,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
@@ -392,7 +390,7 @@ public class ImsPhoneConnection extends Connection implements 


    @Override

    public String getVendorDisconnectCause() {

      return mVendorCause;

      return null;

    }



    @UnsupportedAppUsage
@@ -515,7 +513,6 @@ public class ImsPhoneConnection extends Connection implements 
    void

    onHangupLocal() {

        mCause = DisconnectCause.LOCAL;

        mVendorCause = null;

    }



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

    }



    void

    onRemoteDisconnect(String vendorCause) {

        this.mVendorCause = vendorCause;

    }



    /**

     * An incoming or outgoing call has connected

     */