Merge "IMS: During a call swap, handle the resume failure" into nyc-dev (b3a89f53) · Commits · e / os / android_frameworks_opt_telephony

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

+15 −7

Original line number	Diff line number	Diff line
		@@ -1441,14 +1441,22 @@ public class ImsPhoneCallTracker extends CallTracker {

		@Override
		public void onCallResumeFailed(ImsCall imsCall, ImsReasonInfo reasonInfo) {
		// If we are in the midst of swapping the FG and BG calls and we got a resume fail, we
		// need to swap back the FG and BG calls.
		if (mSwitchingFgAndBgCalls && imsCall == mCallExpectedToResume) {
		if (mSwitchingFgAndBgCalls) {
		// If we are in the midst of swapping the FG and BG calls and
		// we got a resume fail, we need to swap back the FG and BG calls.
		// Since the FG call was held, will also try to resume the same.
		if (imsCall == mCallExpectedToResume) {
		if (DBG) {
		log("onCallResumeFailed : switching " + mForegroundCall + " with "
		+ mBackgroundCall);
		}
		mForegroundCall.switchWith(mBackgroundCall);
		if (mForegroundCall.getState() == ImsPhoneCall.State.HOLDING) {
		sendEmptyMessage(EVENT_RESUME_BACKGROUND);
		}
		}

		//Call swap is done, reset the relevant variables
		mCallExpectedToResume = null;
		mSwitchingFgAndBgCalls = false;
		}