Merge "CSFB SS: Do not show result in case of CDMA" am: 7475f600c3 am: 7fd0a71820 (9ba4263f) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -1345,6 +1345,9 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		} else if (ar.exception instanceof ImsException) {
		sb.append(getImsErrorMessage(ar));
		}
		} else if ((int)ar.result == CommandsInterface.SS_STATUS_UNKNOWN) {
		mState = State.FAILED;
		sb = null;
		} else if (isActivate()) {
		mState = State.COMPLETE;
		if (mIsCallFwdReg) {
		@@ -1488,6 +1491,11 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		else {
		sb.append(getErrorMessage(ar));
		}
		} else if (ar.result instanceof CallForwardInfo[] &&
		((CallForwardInfo[]) ar.result)[0].status
		== CommandsInterface.SS_STATUS_UNKNOWN) {
		sb = null;
		mState = State.FAILED;
		} else {
		CallForwardInfo infos[];

		@@ -1740,7 +1748,9 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode {
		} else {
		sb.append(getErrorMessage(ar));
		}

		} else if ((ar.result instanceof int[]) &&
		((int[])ar.result)[0] == CommandsInterface.SS_STATUS_UNKNOWN) {
		sb = null;
		} else {
		int[] ints = (int[])ar.result;