Merge "IMS: Handle IMS Reason CODE_FDN_BLOCKED" (415158fb) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -101,9 +101,7 @@ import com.android.internal.telephony.util.NotificationChannelController;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayDeque;
		import java.util.ArrayList;
		import java.util.Deque;
		import java.util.List;

		/**
		@@ -1030,6 +1028,9 @@ public class ImsPhone extends ImsPhoneBase {
		break;
		case ImsReasonInfo.CODE_UT_SERVICE_UNAVAILABLE:
		error = CommandException.Error.RADIO_NOT_AVAILABLE;
		break;
		case ImsReasonInfo.CODE_FDN_BLOCKED:
		error = CommandException.Error.FDN_CHECK_FAILURE;
		default:
		break;
		}

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

+44 −57

Original line number	Diff line number	Diff line
		@@ -16,6 +16,17 @@

		package com.android.internal.telephony.imsphone;

		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_ASYNC;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_SYNC;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_FAX;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_MAX;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_NONE;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PACKET;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PAD;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_SMS;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;

		import android.content.Context;
		import android.content.res.Resources;
		import android.os.AsyncResult;
		@@ -24,36 +35,24 @@ import android.os.Handler;
		import android.os.Message;
		import android.os.ResultReceiver;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.Rlog;
		import android.text.SpannableStringBuilder;
		import android.text.TextUtils;
		import android.telephony.Rlog;

		import com.android.ims.ImsException;
		import com.android.ims.ImsReasonInfo;
		import com.android.ims.ImsSsInfo;
		import com.android.ims.ImsUtInterface;
		import com.android.internal.telephony.CallForwardInfo;
		import com.android.internal.telephony.CommandException;
		import com.android.internal.telephony.CallStateException;
		import com.android.internal.telephony.CommandException;
		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.uicc.IccRecords;

		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_NONE;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_FAX;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_SMS;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_SYNC;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_DATA_ASYNC;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PACKET;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_PAD;
		import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_MAX;

		import com.android.internal.telephony.MmiCode;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.uicc.IccRecords;

		import java.util.regex.Pattern;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;

		/**
		* The motto for this file is:
		@@ -1148,6 +1147,14 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		}

		private CharSequence getErrorMessage(AsyncResult ar) {
		if (ar.exception instanceof CommandException) {
		CommandException.Error err = ((CommandException) (ar.exception)).getCommandError();
		if (err == CommandException.Error.FDN_CHECK_FAILURE) {
		Rlog.i(LOG_TAG, "FDN_CHECK_FAILURE");
		return mContext.getText(com.android.internal.R.string.mmiFdnError);
		}
		}

		return mContext.getText(com.android.internal.R.string.mmiError);
		}

		@@ -1192,18 +1199,15 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		if (err.getCommandError() == CommandException.Error.PASSWORD_INCORRECT) {
		sb.append(mContext.getText(
		com.android.internal.R.string.passwordIncorrect));
		} else if (err.getCommandError() == CommandException.Error.FDN_CHECK_FAILURE) {
		sb.append(mContext.getText(com.android.internal.R.string.mmiFdnError));
		} else if (err.getMessage() != null) {
		sb.append(err.getMessage());
		} else {
		sb.append(mContext.getText(com.android.internal.R.string.mmiError));
		}
		} else {
		ImsException error = (ImsException) ar.exception;
		if (error.getMessage() != null) {
		sb.append(error.getMessage());
		} else {
		sb.append(getErrorMessage(ar));
		}
		} else if (ar.exception instanceof ImsException) {
		sb.append(getImsErrorMessage(ar));
		}
		} else if (isActivate()) {
		mState = State.COMPLETE;
		@@ -1336,12 +1340,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		mState = State.FAILED;

		if (ar.exception instanceof ImsException) {
		ImsException error = (ImsException) ar.exception;
		if (error.getMessage() != null) {
		sb.append(error.getMessage());
		} else {
		sb.append(getErrorMessage(ar));
		}
		sb.append(getImsErrorMessage(ar));
		}
		else {
		sb.append(getErrorMessage(ar));
		@@ -1397,21 +1396,14 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		StringBuilder sb = new StringBuilder(getScString());
		sb.append("\n");

		if (ar.exception != null) {
		mState = State.FAILED;

		if (ar.exception != null) {
		if (ar.exception instanceof ImsException) {
		ImsException error = (ImsException) ar.exception;
		if (error.getMessage() != null) {
		sb.append(error.getMessage());
		sb.append(getImsErrorMessage(ar));
		} else {
		sb.append(getErrorMessage(ar));
		}
		} else {
		sb.append(getErrorMessage(ar));
		}
		} else {
		mState = State.FAILED;
		ImsSsInfo ssInfo = null;
		if (ar.result instanceof Bundle) {
		Rlog.d(LOG_TAG, "onSuppSvcQueryComplete: Received CLIP/COLP/COLR Response.");
		@@ -1462,12 +1454,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		mState = State.FAILED;

		if (ar.exception instanceof ImsException) {
		ImsException error = (ImsException) ar.exception;
		if (error.getMessage() != null) {
		sb.append(error.getMessage());
		} else {
		sb.append(getErrorMessage(ar));
		}
		sb.append(getImsErrorMessage(ar));
		} else {
		sb.append(getErrorMessage(ar));
		}
		@@ -1501,14 +1488,8 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		mState = State.FAILED;

		if (ar.exception != null) {

		if (ar.exception instanceof ImsException) {
		ImsException error = (ImsException) ar.exception;
		if (error.getMessage() != null) {
		sb.append(error.getMessage());
		} else {
		sb.append(getErrorMessage(ar));
		}
		sb.append(getImsErrorMessage(ar));
		}
		} else {
		Bundle ssInfo = (Bundle) ar.result;
		@@ -1599,12 +1580,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		mState = State.FAILED;

		if (ar.exception instanceof ImsException) {
		ImsException error = (ImsException) ar.exception;
		if (error.getMessage() != null) {
		sb.append(error.getMessage());
		} else {
		sb.append(getErrorMessage(ar));
		}
		sb.append(getImsErrorMessage(ar));
		} else {
		sb.append(getErrorMessage(ar));
		}
		@@ -1652,6 +1628,17 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		return sb;
		}

		private CharSequence getImsErrorMessage(AsyncResult ar) {
		ImsException error = (ImsException) ar.exception;
		if (error.getCode() == ImsReasonInfo.CODE_FDN_BLOCKED) {
		return mContext.getText(com.android.internal.R.string.mmiFdnError);
		} else if (error.getMessage() != null) {
		return error.getMessage();
		} else {
		return getErrorMessage(ar);
		}
		}

		@Override
		public ResultReceiver getUssdCallbackReceiver() {
		return this.mCallbackReceiver;