Merge "IMS: implementation of CSFB USSD" am: 36906dbd61 am: ad7755395a (4e98883b) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1225,6 +1225,8 @@ public class ImsPhone extends ImsPhoneBase {
		}

		public void sendUSSD(String ussdString, Message response) {
		Rlog.d(LOG_TAG, "sendUssd ussdString = " + ussdString);
		mLastDialString = ussdString;
		mCT.sendUSSD(ussdString, response);
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -3529,6 +3529,20 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		public void onCallStartFailed(ImsCall imsCall, ImsReasonInfo reasonInfo) {
		if (DBG) log("mImsUssdListener onCallStartFailed reasonCode=" + reasonInfo.getCode());

		if (mUssdSession != null) {
		if (DBG) log("mUssdSession is not null");
		// To initiate sending Ussd under circuit-switched call
		if (reasonInfo.getCode() == ImsReasonInfo.CODE_LOCAL_CALL_CS_RETRY_REQUIRED) {
		mUssdSession = null;
		mPhone.getPendingMmiCodes().clear();
		mPhone.initiateSilentRedial();
		if (DBG) log("Initiated sending ussd by using silent redial.");
		return;
		} else {
		if (DBG) log("Failed to start sending ussd by using silent resendUssd.!!");
		}
		}

		onCallTerminated(imsCall, reasonInfo);
		}