Merge "Amend earlier fix for hold failures" am: a3e3ce5b01 am: 2c60e92f6d (f8f5a152) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -2483,6 +2483,13 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		}
		// Leave mHoldSwitchingState as is for now -- we'll reset it
		// in onCallTerminated, which will also dial the outgoing emergency call.
		} else if (mRingingCall.getState() == ImsPhoneCall.State.WAITING
		&& mHoldSwitchingState == HoldSwapState.HOLDING_TO_ANSWER_INCOMING) {
		// If we issued a hold request in order to answer an incoming call, we need
		// to tell Telecom that we can't actually answer the incoming call.
		mHoldSwitchingState = HoldSwapState.INACTIVE;
		mForegroundCall.switchWith(mBackgroundCall);
		logHoldSwapState("onCallHoldFailed unable to answer waiting call");
		} else if (bgState == ImsPhoneCall.State.ACTIVE) {
		mForegroundCall.switchWith(mBackgroundCall);

		@@ -2494,12 +2501,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		mCallExpectedToResume = null;
		}
		mHoldSwitchingState = HoldSwapState.INACTIVE;
		} else if (mRingingCall.getState() == ImsPhoneCall.State.WAITING
		&& mHoldSwitchingState == HoldSwapState.HOLDING_TO_ANSWER_INCOMING) {
		// If we issued a hold request in order to answer an incoming call, we need
		// to tell Telecom that we can't actually answer the incoming call.
		mHoldSwitchingState = HoldSwapState.INACTIVE;
		logHoldSwapState("onCallHoldFailed unable to answer waiting call");
		}
		ImsPhoneConnection conn = findConnection(imsCall);
		if (conn != null) {