Merge "IMS: UT serviceClass" (268459c4) · Commits · e / os / android_frameworks_opt_telephony

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

+17 −2

Original line number	Diff line number	Diff line
		@@ -728,8 +728,18 @@ public class ImsPhone extends ImsPhoneBase {
		String dialingNumber,
		int timerSeconds,
		Message onComplete) {
		setCallForwardingOption(commandInterfaceCFAction, commandInterfaceCFReason, dialingNumber,
		CommandsInterface.SERVICE_CLASS_VOICE, timerSeconds, onComplete);
		}

		public void setCallForwardingOption(int commandInterfaceCFAction,
		int commandInterfaceCFReason,
		String dialingNumber,
		int serviceClass,
		int timerSeconds,
		Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "setCallForwardingOption action=" + commandInterfaceCFAction
		+ ", reason=" + commandInterfaceCFReason);
		+ ", reason=" + commandInterfaceCFReason + " serviceClass=" + serviceClass);
		if ((isValidCommandInterfaceCFAction(commandInterfaceCFAction)) &&
		(isValidCommandInterfaceCFReason(commandInterfaceCFReason))) {
		Message resp;
		@@ -744,6 +754,7 @@ public class ImsPhone extends ImsPhoneBase {
		ut.updateCallForward(getActionFromCFAction(commandInterfaceCFAction),
		getConditionFromCFReason(commandInterfaceCFReason),
		dialingNumber,
		serviceClass,
		timerSeconds,
		onComplete);
		} catch (ImsException e) {
		@@ -802,13 +813,17 @@ public class ImsPhone extends ImsPhoneBase {

		@Override
		public void setCallWaiting(boolean enable, Message onComplete) {
		setCallWaiting(enable, CommandsInterface.SERVICE_CLASS_VOICE, onComplete);
		}

		public void setCallWaiting(boolean enable, int serviceClass, Message onComplete) {
		if (DBG) Rlog.d(LOG_TAG, "setCallWaiting enable=" + enable);
		Message resp;
		resp = obtainMessage(EVENT_SET_CALL_WAITING_DONE, onComplete);

		try {
		ImsUtInterface ut = mCT.getUtInterface();
		ut.updateCallWaiting(enable, resp);
		ut.updateCallWaiting(enable, serviceClass, resp);
		} catch (ImsException e) {
		sendErrorResponse(onComplete, e);
		}

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -782,10 +782,10 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		throw new CallStateException(ImsPhone.CS_FALLBACK);
		} else if (isServiceCodeCallForwarding(mSc)) {
		Rlog.d(LOG_TAG, "is CF");
		// service group is not supported

		String dialingNumber = mSia;
		int reason = scToCallForwardReason(mSc);
		int serviceClass = siToServiceClass(mSib);
		int time = siToTime(mSic);

		if (isInterrogate()) {
		@@ -806,7 +806,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {

		Rlog.d(LOG_TAG, "is CF setCallForward");
		mPhone.setCallForwardingOption(cfAction, reason,
		dialingNumber, time, obtainMessage(
		dialingNumber, serviceClass, time, obtainMessage(
		EVENT_SET_CFF_COMPLETE,
		isSettingUnconditional,
		isEnableDesired, this));
		@@ -1007,9 +1007,10 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		}
		} else if (mSc != null && mSc.equals(SC_WAIT)) {
		// sia = basic service group
		// service group is not supported
		int serviceClass = siToServiceClass(mSib);

		if (isActivate() \|\| isDeactivate()) {
		mPhone.setCallWaiting(isActivate(),
		mPhone.setCallWaiting(isActivate(), serviceClass,
		obtainMessage(EVENT_SET_COMPLETE, this));
		} else if (isInterrogate()) {
		mPhone.getCallWaiting(obtainMessage(EVENT_QUERY_COMPLETE, this));