Merge "IMS:Exit ECBM before dialing pending non-e911 call" into mm-wireless-dev (9e138a33) · Commits · e / os / android_frameworks_opt_telephony

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

+41 −4

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@ public final class ImsPhoneCallTracker extends CallTracker {
		private static final int EVENT_HANGUP_PENDINGMO = 18;
		private static final int EVENT_RESUME_BACKGROUND = 19;
		private static final int EVENT_DIAL_PENDINGMO = 20;
		private static final int EVENT_EXIT_ECBM_BEFORE_PENDINGMO = 21;

		private static final int TIMEOUT_HANGUP_PENDINGMO = 500;

		@@ -326,8 +327,7 @@ public final class ImsPhoneCallTracker extends CallTracker {
		synchronized Connection
		dial(String dialString, int clirMode, int videoState, Bundle intentExtras)
		throws CallStateException {
		boolean isPhoneInEcmMode = SystemProperties.getBoolean(
		TelephonyProperties.PROPERTY_INECM_MODE, false);
		boolean isPhoneInEcmMode = isPhoneInEcbMode();
		boolean isEmergencyNumber = PhoneNumberUtils.isEmergencyNumber(dialString);

		if (DBG) log("dial clirMode=" + clirMode);
		@@ -1157,6 +1157,27 @@ public final class ImsPhoneCallTracker extends CallTracker {
		return cause;
		}

		/**
		* @return true if the phone is in Emergency Callback mode, otherwise false
		*/
		private boolean isPhoneInEcbMode() {
		return SystemProperties.getBoolean(TelephonyProperties.PROPERTY_INECM_MODE, false);
		}

		/**
		* Before dialing pending MO request, check for the Emergency Callback mode.
		* If device is in Emergency callback mode, then exit the mode before dialing pending MO.
		*/
		private void dialPendingMO() {
		boolean isPhoneInEcmMode = isPhoneInEcbMode();
		boolean isEmergencyNumber = mPendingMO.isEmergency();
		if ((!isPhoneInEcmMode) \|\| (isPhoneInEcmMode && isEmergencyNumber)) {
		sendEmptyMessage(EVENT_DIAL_PENDINGMO);
		} else {
		sendEmptyMessage(EVENT_EXIT_ECBM_BEFORE_PENDINGMO);
		}
		}

		/**
		* Listen to the IMS call state change
		*/
		@@ -1318,7 +1339,7 @@ public final class ImsPhoneCallTracker extends CallTracker {
		//only the first callback reaches here
		//otherwise the oldState is already HOLDING
		if (mPendingMO != null) {
		sendEmptyMessage(EVENT_DIAL_PENDINGMO);
		dialPendingMO();
		}

		// In this case there will be no call resumed, so we can assume that we
		@@ -1349,7 +1370,7 @@ public final class ImsPhoneCallTracker extends CallTracker {
		if (reasonInfo.getCode() == ImsReasonInfo.CODE_LOCAL_CALL_TERMINATED) {
		// disconnected while processing hold
		if (mPendingMO != null) {
		sendEmptyMessage(EVENT_DIAL_PENDINGMO);
		dialPendingMO();
		}
		} else if (bgState == ImsPhoneCall.State.ACTIVE) {
		mForegroundCall.switchWith(mBackgroundCall);
		@@ -1858,6 +1879,22 @@ public final class ImsPhoneCallTracker extends CallTracker {
		mPendingIntentExtras = null;
		break;

		case EVENT_EXIT_ECBM_BEFORE_PENDINGMO:
		if (mPendingMO != null) {
		//Send ECBM exit request
		try {
		getEcbmInterface().exitEmergencyCallbackMode();
		mPhone.setOnEcbModeExitResponse(this, EVENT_EXIT_ECM_RESPONSE_CDMA, null);
		pendingCallClirMode = mClirMode;
		pendingCallInEcm = true;
		} catch (ImsException e) {
		e.printStackTrace();
		mPendingMO.setDisconnectCause(DisconnectCause.ERROR_UNSPECIFIED);
		sendEmptyMessageDelayed(EVENT_HANGUP_PENDINGMO, TIMEOUT_HANGUP_PENDINGMO);
		}
		}
		break;

		case EVENT_EXIT_ECM_RESPONSE_CDMA:
		// no matter the result, we still do the same here
		if (pendingCallInEcm) {