Merge "Remove onCallInitiating/Progressing order exceptions." into sc-dev (7580ee7c) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -2892,21 +2892,9 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private ImsCall.Listener mImsCallListener = new ImsCall.Listener() {
		boolean mOnCallInitiatingCalled = false;
		boolean mOnCallProgressingCalled = false;

		@Override
		public void onCallInitiating(ImsCall imsCall) {
		if (DBG) log("onCallInitiating");

		if (mOnCallInitiatingCalled) {
		throw new IllegalStateException("onCallInitiating cannot be called twice.");
		} else if (mOnCallProgressingCalled) {
		throw new IllegalStateException("onCallInitiating cannot be called after "
		+ "onCallProgressing has been called.");
		}
		mOnCallInitiatingCalled = true;

		mPendingMO = null;
		processCallStateChange(imsCall, ImsPhoneCall.State.DIALING,
		DisconnectCause.NOT_DISCONNECTED, true);
		@@ -2917,8 +2905,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		public void onCallProgressing(ImsCall imsCall) {
		if (DBG) log("onCallProgressing");

		mOnCallProgressingCalled = true;

		mPendingMO = null;
		processCallStateChange(imsCall, ImsPhoneCall.State.ALERTING,
		DisconnectCause.NOT_DISCONNECTED);