Merge "Revert "Support Voice Clear Code for VoLTE"" into rvc-qpr-dev (203e00cd) · Commits · e / os / android_frameworks_opt_telephony

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);

+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
		*/