Merge "Use public getters for IMS supp services" (e49d2a76) · Commits · e / os / android_frameworks_opt_telephony

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

+30 −41

Original line number	Diff line number	Diff line
		@@ -156,17 +156,6 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		public static final String UT_BUNDLE_KEY_CLIR = "queryClir";
		public static final String UT_BUNDLE_KEY_SSINFO = "imsSsInfo";

		//***** Calling Line Identity Restriction Constants
		// The 'm' parameter from TS 27.007 7.7
		private static final int CLIR_NOT_PROVISIONED = 0;
		private static final int CLIR_PROVISIONED_PERMANENT = 1;
		private static final int CLIR_PRESENTATION_RESTRICTED_TEMPORARY = 3;
		private static final int CLIR_PRESENTATION_ALLOWED_TEMPORARY = 4;
		// The 'n' parameter from TS 27.007 7.7
		private static final int CLIR_DEFAULT = 0;
		private static final int CLIR_INVOCATION = 1;
		private static final int CLIR_SUPPRESSION = 2;

		//***** Instance Variables

		private ImsPhone mPhone;
		@@ -1547,9 +1536,9 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		sb.append(mContext.getText(com.android.internal.R.string.serviceDisabled));
		} else {
		for (int i = 0, s = infos.length; i < s ; i++) {
		if (infos[i].getIcbNum() != null) {
		sb.append("Num: " + infos[i].getIcbNum() + " status: "
		+ infos[i].getStatus() + "\n");
		if (infos[i].getIncomingCommunicationBarringNumber() != null) {
		sb.append("Num: " + infos[i].getIncomingCommunicationBarringNumber()
		+ " status: " + infos[i].getStatus() + "\n");
		} else if (infos[i].getStatus() == 1) {
		sb.append(mContext.getText(com.android.internal
		.R.string.serviceEnabled));
		@@ -1584,30 +1573,30 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {

		// 'm' parameter.
		switch (clirInfo[1]) {
		case CLIR_NOT_PROVISIONED:
		case ImsSsInfo.CLIR_STATUS_NOT_PROVISIONED:
		sb.append(mContext.getText(
		com.android.internal.R.string.serviceNotProvisioned));
		mState = State.COMPLETE;
		break;
		case CLIR_PROVISIONED_PERMANENT:
		case ImsSsInfo.CLIR_STATUS_PROVISIONED_PERMANENT:
		sb.append(mContext.getText(
		com.android.internal.R.string.CLIRPermanent));
		mState = State.COMPLETE;
		break;
		case CLIR_PRESENTATION_RESTRICTED_TEMPORARY:
		case ImsSsInfo.CLIR_STATUS_TEMPORARILY_RESTRICTED:
		// 'n' parameter.
		switch (clirInfo[0]) {
		case CLIR_DEFAULT:
		case ImsSsInfo.CLIR_OUTGOING_DEFAULT:
		sb.append(mContext.getText(
		com.android.internal.R.string.CLIRDefaultOnNextCallOn));
		mState = State.COMPLETE;
		break;
		case CLIR_INVOCATION:
		case ImsSsInfo.CLIR_OUTGOING_INVOCATION:
		sb.append(mContext.getText(
		com.android.internal.R.string.CLIRDefaultOnNextCallOn));
		mState = State.COMPLETE;
		break;
		case CLIR_SUPPRESSION:
		case ImsSsInfo.CLIR_OUTGOING_SUPPRESSION:
		sb.append(mContext.getText(
		com.android.internal.R.string.CLIRDefaultOnNextCallOff));
		mState = State.COMPLETE;
		@@ -1618,20 +1607,20 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		mState = State.FAILED;
		}
		break;
		case CLIR_PRESENTATION_ALLOWED_TEMPORARY:
		case ImsSsInfo.CLIR_STATUS_TEMPORARILY_ALLOWED:
		// 'n' parameter.
		switch (clirInfo[0]) {
		case CLIR_DEFAULT:
		case ImsSsInfo.CLIR_OUTGOING_DEFAULT:
		sb.append(mContext.getText(
		com.android.internal.R.string.CLIRDefaultOffNextCallOff));
		mState = State.COMPLETE;
		break;
		case CLIR_INVOCATION:
		case ImsSsInfo.CLIR_OUTGOING_INVOCATION:
		sb.append(mContext.getText(
		com.android.internal.R.string.CLIRDefaultOffNextCallOn));
		mState = State.COMPLETE;
		break;
		case CLIR_SUPPRESSION:
		case ImsSsInfo.CLIR_OUTGOING_SUPPRESSION:
		sb.append(mContext.getText(
		com.android.internal.R.string.CLIRDefaultOffNextCallOff));
		mState = State.COMPLETE;
		@@ -1741,27 +1730,27 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		}

		void parseSsData(ImsSsData ssData) {
		ImsException ex = (ssData.result != ImsSsData.RESULT_SUCCESS)
		? new ImsException(null, ssData.result) : null;
		mSc = getScStringFromScType(ssData.serviceType);
		mAction = getActionStringFromReqType(ssData.requestType);
		ImsException ex = (ssData.getResult() != ImsSsData.RESULT_SUCCESS)
		? new ImsException(null, ssData.getResult()) : null;
		mSc = getScStringFromScType(ssData.getServiceType());
		mAction = getActionStringFromReqType(ssData.getRequestType());
		Rlog.d(LOG_TAG, "parseSsData msc = " + mSc + ", action = " + mAction + ", ex = " + ex);

		switch (ssData.requestType) {
		switch (ssData.getRequestType()) {
		case ImsSsData.SS_ACTIVATION:
		case ImsSsData.SS_DEACTIVATION:
		case ImsSsData.SS_REGISTRATION:
		case ImsSsData.SS_ERASURE:
		if ((ssData.result == ImsSsData.RESULT_SUCCESS)
		if ((ssData.getResult() == ImsSsData.RESULT_SUCCESS)
		&& ssData.isTypeUnConditional()) {
		/*
		* When ssData.serviceType is unconditional (SS_CFU or SS_CF_ALL) and
		* ssData.requestType is activate/register and
		* ServiceClass is Voice/Video/None, turn on voice call forwarding.
		*/
		boolean cffEnabled = ((ssData.requestType == ImsSsData.SS_ACTIVATION
		\|\| ssData.requestType == ImsSsData.SS_REGISTRATION)
		&& isServiceClassVoiceVideoOrNone(ssData.serviceClass));
		boolean cffEnabled = ((ssData.getRequestType() == ImsSsData.SS_ACTIVATION
		\|\| ssData.getRequestType() == ImsSsData.SS_REGISTRATION)
		&& isServiceClassVoiceVideoOrNone(ssData.getServiceClass()));

		Rlog.d(LOG_TAG, "setCallForwardingFlag cffEnabled: " + cffEnabled);
		if (mIccRecords != null) {
		@@ -1779,29 +1768,29 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		if (ssData.isTypeClir()) {
		Rlog.d(LOG_TAG, "CLIR INTERROGATION");
		Bundle clirInfo = new Bundle();
		clirInfo.putIntArray(UT_BUNDLE_KEY_CLIR, ssData.getSuppServiceInfo());
		clirInfo.putIntArray(UT_BUNDLE_KEY_CLIR, ssData.getSuppServiceInfoCompat());
		onQueryClirComplete(new AsyncResult(null, clirInfo, ex));
		} else if (ssData.isTypeCF()) {
		Rlog.d(LOG_TAG, "CALL FORWARD INTERROGATION");
		onQueryCfComplete(new AsyncResult(null, mPhone
		.handleCfQueryResult(ssData.getCallForwardInfo()), ex));
		} else if (ssData.isTypeBarring()) {
		onSuppSvcQueryComplete(new AsyncResult(null, ssData.getSuppServiceInfo(), ex));
		onSuppSvcQueryComplete(new AsyncResult(null, ssData.getSuppServiceInfoCompat(),
		ex));
		} else if (ssData.isTypeColr() \|\| ssData.isTypeClip() \|\| ssData.isTypeColp()) {
		int[] suppServiceInfo = ssData.getSuppServiceInfo();
		ImsSsInfo ssInfo = new ImsSsInfo(suppServiceInfo[0], null);
		int[] suppServiceInfo = ssData.getSuppServiceInfoCompat();
		ImsSsInfo ssInfo = new ImsSsInfo.Builder(suppServiceInfo[0]).build();
		Bundle clInfo = new Bundle();
		clInfo.putParcelable(UT_BUNDLE_KEY_SSINFO, ssInfo);
		onSuppSvcQueryComplete(new AsyncResult(null, clInfo, ex));
		} else if (ssData.isTypeIcb()) {
		onIcbQueryComplete(new AsyncResult(null, ssData.getImsSpecificSuppServiceInfo(),
		ex));
		onIcbQueryComplete(new AsyncResult(null, ssData.getSuppServiceInfo(), ex));
		} else {
		onQueryComplete(new AsyncResult(null, ssData.getSuppServiceInfo(), ex));
		onQueryComplete(new AsyncResult(null, ssData.getSuppServiceInfoCompat(), ex));
		}
		break;
		default:
		Rlog.e(LOG_TAG, "Invaid requestType in SSData : " + ssData.requestType);
		Rlog.e(LOG_TAG, "Invaid requestType in SSData : " + ssData.getRequestType());
		break;
		}
		}