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

Commit 49a0c367 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Support Voice Clear Code for VoLTE"" am: 28bbc318 am:... 

Merge "Revert "Support Voice Clear Code for VoLTE"" am: 28bbc318 am: a1f536d9 am: 97ef64d6 am: 3fecf052 am: 7bdfb240

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1421948

Change-Id: Ib92d96db33e3d0c453f671345575144d25a3d16b
parents 348a437b 7bdfb240

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

+0 −7
Original line number Diff line number Diff line
@@ -2968,10 +2968,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 " +
@@ -3769,9 +3765,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

     */