Merge "Use @SystemApis in platform instead of hidden fields" into pi-dev (56b2b32b) · Commits · e / os / android_frameworks_opt_telephony

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -1280,12 +1280,12 @@ public class ImsPhone extends ImsPhoneBase {

		private CallForwardInfo getCallForwardInfo(ImsCallForwardInfo info) {
		CallForwardInfo cfInfo = new CallForwardInfo();
		cfInfo.status = info.mStatus;
		cfInfo.reason = getCFReasonFromCondition(info.mCondition);
		cfInfo.status = info.getStatus();
		cfInfo.reason = getCFReasonFromCondition(info.getCondition());
		cfInfo.serviceClass = SERVICE_CLASS_VOICE;
		cfInfo.toa = info.mToA;
		cfInfo.number = info.mNumber;
		cfInfo.timeSeconds = info.mTimeSeconds;
		cfInfo.toa = info.getToA();
		cfInfo.number = info.getNumber();
		cfInfo.timeSeconds = info.getTimeSeconds();
		return cfInfo;
		}

		@@ -1309,10 +1309,10 @@ public class ImsPhone extends ImsPhoneBase {
		}
		} else {
		for (int i = 0, s = infos.length; i < s; i++) {
		if (infos[i].mCondition == ImsUtInterface.CDIV_CF_UNCONDITIONAL) {
		if (infos[i].getCondition() == ImsUtInterface.CDIV_CF_UNCONDITIONAL) {
		if (r != null) {
		setVoiceCallForwardingFlag(r, 1, (infos[i].mStatus == 1),
		infos[i].mNumber);
		setVoiceCallForwardingFlag(r, 1, (infos[i].getStatus() == 1),
		infos[i].getNumber());
		}
		}
		cfInfos[i] = getCallForwardInfo(infos[i]);
		@@ -1326,7 +1326,7 @@ public class ImsPhone extends ImsPhoneBase {
		int[] cbInfos = new int[1];
		cbInfos[0] = SERVICE_CLASS_NONE;

		if (infos[0].mStatus == 1) {
		if (infos[0].getStatus() == 1) {
		cbInfos[0] = SERVICE_CLASS_VOICE;
		}

		@@ -1337,7 +1337,7 @@ public class ImsPhone extends ImsPhoneBase {
		int[] cwInfos = new int[2];
		cwInfos[0] = 0;

		if (infos[0].mStatus == 1) {
		if (infos[0].getStatus() == 1) {
		cwInfos[0] = 1;
		cwInfos[1] = SERVICE_CLASS_VOICE;
		}

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

+21 −21

Original line number	Diff line number	Diff line
		@@ -36,13 +36,13 @@ import android.os.Message;
		import android.os.ResultReceiver;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.Rlog;
		import android.telephony.ims.ImsReasonInfo;
		import android.telephony.ims.ImsSsData;
		import android.telephony.ims.ImsSsInfo;
		import android.text.SpannableStringBuilder;
		import android.text.TextUtils;

		import com.android.ims.ImsException;
		import android.telephony.ims.ImsReasonInfo;
		import android.telephony.ims.ImsSsData;
		import android.telephony.ims.ImsSsInfo;
		import com.android.ims.ImsUtInterface;
		import com.android.internal.telephony.CallForwardInfo;
		import com.android.internal.telephony.CallStateException;
		@@ -50,7 +50,6 @@ import com.android.internal.telephony.CommandException;
		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.MmiCode;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.RILConstants;
		import com.android.internal.telephony.uicc.IccRecords;

		import java.util.regex.Matcher;
		@@ -1472,11 +1471,11 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		ssInfo = (ImsSsInfo) ssInfoResp.getParcelable(UT_BUNDLE_KEY_SSINFO);
		if (ssInfo != null) {
		Rlog.d(LOG_TAG,
		"onSuppSvcQueryComplete: ImsSsInfo mStatus = " + ssInfo.mStatus);
		if (ssInfo.mStatus == ImsSsInfo.DISABLED) {
		"onSuppSvcQueryComplete: ImsSsInfo mStatus = " + ssInfo.getStatus());
		if (ssInfo.getStatus() == ImsSsInfo.DISABLED) {
		sb.append(mContext.getText(com.android.internal.R.string.serviceDisabled));
		mState = State.COMPLETE;
		} else if (ssInfo.mStatus == ImsSsInfo.ENABLED) {
		} else if (ssInfo.getStatus() == ImsSsInfo.ENABLED) {
		sb.append(mContext.getText(com.android.internal.R.string.serviceEnabled));
		mState = State.COMPLETE;
		} else {
		@@ -1524,10 +1523,10 @@ 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].mIcbNum !=null) {
		sb.append("Num: " + infos[i].mIcbNum + " status: "
		+ infos[i].mStatus + "\n");
		} else if (infos[i].mStatus == 1) {
		if (infos[i].getIcbNum() != null) {
		sb.append("Num: " + infos[i].getIcbNum() + " status: "
		+ infos[i].getStatus() + "\n");
		} else if (infos[i].getStatus() == 1) {
		sb.append(mContext.getText(com.android.internal
		.R.string.serviceEnabled));
		} else {
		@@ -1718,7 +1717,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		}

		void parseSsData(ImsSsData ssData) {
		ImsException ex = (ssData.result != RILConstants.SUCCESS)
		ImsException ex = (ssData.result != ImsSsData.RESULT_SUCCESS)
		? new ImsException(null, ssData.result) : null;
		mSc = getScStringFromScType(ssData.serviceType);
		mAction = getActionStringFromReqType(ssData.requestType);
		@@ -1729,7 +1728,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		case ImsSsData.SS_DEACTIVATION:
		case ImsSsData.SS_REGISTRATION:
		case ImsSsData.SS_ERASURE:
		if ((ssData.result == RILConstants.SUCCESS)
		if ((ssData.result == ImsSsData.RESULT_SUCCESS)
		&& ssData.isTypeUnConditional()) {
		/*
		* When ssData.serviceType is unconditional (SS_CFU or SS_CF_ALL) and
		@@ -1750,30 +1749,31 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		Rlog.e(LOG_TAG, "setCallForwardingFlag aborted. sim records is null.");
		}
		}
		onSetComplete(null, new AsyncResult(null, ssData.cfInfo, ex));
		onSetComplete(null, new AsyncResult(null, ssData.getCallForwardInfo(), ex));
		break;
		case ImsSsData.SS_INTERROGATION:
		if (ssData.isTypeClir()) {
		Rlog.d(LOG_TAG, "CLIR INTERROGATION");
		Bundle clirInfo = new Bundle();
		clirInfo.putIntArray(UT_BUNDLE_KEY_CLIR, ssData.ssInfo);
		clirInfo.putIntArray(UT_BUNDLE_KEY_CLIR, ssData.getSuppServiceInfo());
		onQueryClirComplete(new AsyncResult(null, clirInfo, ex));
		} else if (ssData.isTypeCF()) {
		Rlog.d(LOG_TAG, "CALL FORWARD INTERROGATION");
		onQueryCfComplete(new AsyncResult(null, mPhone
		.handleCfQueryResult(ssData.cfInfo), ex));
		.handleCfQueryResult(ssData.getCallForwardInfo()), ex));
		} else if (ssData.isTypeBarring()) {
		onSuppSvcQueryComplete(new AsyncResult(null, ssData.ssInfo, ex));
		onSuppSvcQueryComplete(new AsyncResult(null, ssData.getSuppServiceInfo(), ex));
		} else if (ssData.isTypeColr() \|\| ssData.isTypeClip() \|\| ssData.isTypeColp()) {
		ImsSsInfo ssInfo = new ImsSsInfo();
		ssInfo.mStatus = ssData.ssInfo[0];
		int[] suppServiceInfo = ssData.getSuppServiceInfo();
		ImsSsInfo ssInfo = new ImsSsInfo(suppServiceInfo[0], null);
		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.imsSsInfo, ex));
		onIcbQueryComplete(new AsyncResult(null, ssData.getImsSpecificSuppServiceInfo(),
		ex));
		} else {
		onQueryComplete(new AsyncResult(null, ssData.ssInfo, ex));
		onQueryComplete(new AsyncResult(null, ssData.getSuppServiceInfo(), ex));
		}
		break;
		default: