Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6d25ac6 authored Sep 19, 2018 by Tyler Gunn Committed by Gerrit Code Review Sep 19, 2018

Merge "Remap "SIP_NOT_FOUND" to INVALID_NUMBER."

parents feff28f0 be6a22dc

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2006,10 +2006,12 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
	return DisconnectCause.SERVER_ERROR;		return DisconnectCause.SERVER_ERROR;

	case ImsReasonInfo.CODE_SIP_SERVICE_UNAVAILABLE:		case ImsReasonInfo.CODE_SIP_SERVICE_UNAVAILABLE:
	case ImsReasonInfo.CODE_SIP_NOT_FOUND:
	case ImsReasonInfo.CODE_SIP_SERVER_ERROR:		case ImsReasonInfo.CODE_SIP_SERVER_ERROR:
	return DisconnectCause.SERVER_UNREACHABLE;		return DisconnectCause.SERVER_UNREACHABLE;

			case ImsReasonInfo.CODE_SIP_NOT_FOUND:
			return DisconnectCause.INVALID_NUMBER;

	case ImsReasonInfo.CODE_LOCAL_NETWORK_ROAMING:		case ImsReasonInfo.CODE_LOCAL_NETWORK_ROAMING:
	case ImsReasonInfo.CODE_LOCAL_NETWORK_IP_CHANGED:		case ImsReasonInfo.CODE_LOCAL_NETWORK_IP_CHANGED:
	case ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN:		case ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN:

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -838,5 +838,13 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest {
	mCTUT.getDisconnectCauseFromReasonInfo(		mCTUT.getDisconnectCauseFromReasonInfo(
	new ImsReasonInfo(ImsReasonInfo.CODE_UNSPECIFIED, 0), Call.State.ACTIVE));		new ImsReasonInfo(ImsReasonInfo.CODE_UNSPECIFIED, 0), Call.State.ACTIVE));
	}		}

			@Test
			@SmallTest
			public void testSipNotFoundRemap() {
			assertEquals(DisconnectCause.INVALID_NUMBER,
			mCTUT.getDisconnectCauseFromReasonInfo(
			new ImsReasonInfo(ImsReasonInfo.CODE_SIP_NOT_FOUND, 0), Call.State.ACTIVE));
			}
	}		}