Merge "IMS: Add support for STK CC feature" am: bc813005b8 (e5146444) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -4422,7 +4422,9 @@
		<string name="stk_cc_ussd_to_dial">USSD request is modified to DIAL request.</string>
		<string name="stk_cc_ussd_to_ss">USSD request is modified to SS request.</string>
		<string name="stk_cc_ussd_to_ussd">USSD request is modified to new USSD request.</string>
		<string name="stk_cc_ussd_to_dial_video">USSD request is modified to Video DIAL request.</string>
		<string name="stk_cc_ss_to_dial">SS request is modified to DIAL request.</string>
		<string name="stk_cc_ss_to_dial_video">SS request is modified to Video DIAL request.</string>
		<string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string>
		<string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string>

core/res/res/values/symbols.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1031,9 +1031,11 @@
		<java-symbol type="string" name="stk_cc_ss_to_dial" />
		<java-symbol type="string" name="stk_cc_ss_to_ss" />
		<java-symbol type="string" name="stk_cc_ss_to_ussd" />
		<java-symbol type="string" name="stk_cc_ss_to_dial_video" />
		<java-symbol type="string" name="stk_cc_ussd_to_dial" />
		<java-symbol type="string" name="stk_cc_ussd_to_ss" />
		<java-symbol type="string" name="stk_cc_ussd_to_ussd" />
		<java-symbol type="string" name="stk_cc_ussd_to_dial_video" />
		<java-symbol type="string" name="safe_media_volume_warning" />
		<java-symbol type="string" name="media_route_status_scanning" />
		<java-symbol type="string" name="media_route_status_connecting" />

telephony/java/android/telephony/DisconnectCause.java

+40 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,36 @@ public class DisconnectCause {
		* {@hide}
		*/
		public static final int NORMAL_UNSPECIFIED = 65;

		/**
		* Stk Call Control modified DIAL request to video DIAL request.
		* {@hide}
		*/
		public static final int DIAL_MODIFIED_TO_DIAL_VIDEO = 66;

		/**
		* Stk Call Control modified Video DIAL request to SS request.
		* {@hide}
		*/
		public static final int DIAL_VIDEO_MODIFIED_TO_SS = 67;

		/**
		* Stk Call Control modified Video DIAL request to USSD request.
		* {@hide}
		*/
		public static final int DIAL_VIDEO_MODIFIED_TO_USSD = 68;

		/**
		* Stk Call Control modified Video DIAL request to DIAL request.
		* {@hide}
		*/
		public static final int DIAL_VIDEO_MODIFIED_TO_DIAL = 69;

		/**
		* Stk Call Control modified Video DIAL request to Video DIAL request.
		* {@hide}
		*/
		public static final int DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 70;
		//*********************************************************************************************
		// When adding a disconnect type:
		// 1) Update toString() with the newly added disconnect type.
		@@ -382,6 +412,16 @@ public class DisconnectCause {
		return "DIAL_MODIFIED_TO_SS";
		case DIAL_MODIFIED_TO_DIAL:
		return "DIAL_MODIFIED_TO_DIAL";
		case DIAL_MODIFIED_TO_DIAL_VIDEO:
		return "DIAL_MODIFIED_TO_DIAL_VIDEO";
		case DIAL_VIDEO_MODIFIED_TO_SS:
		return "DIAL_VIDEO_MODIFIED_TO_SS";
		case DIAL_VIDEO_MODIFIED_TO_USSD:
		return "DIAL_VIDEO_MODIFIED_TO_USSD";
		case DIAL_VIDEO_MODIFIED_TO_DIAL:
		return "DIAL_VIDEO_MODIFIED_TO_DIAL";
		case DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO:
		return "DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO";
		case ERROR_UNSPECIFIED:
		return "ERROR_UNSPECIFIED";
		case OUTGOING_FAILURE:

telephony/java/android/telephony/ims/stub/ImsUtListenerImplBase.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.os.RemoteException;

		import com.android.ims.ImsCallForwardInfo;
		import com.android.ims.ImsReasonInfo;
		import com.android.ims.ImsSsData;
		import com.android.ims.ImsSsInfo;
		import com.android.ims.internal.IImsUt;
		import com.android.ims.internal.IImsUtListener;
		@@ -85,4 +86,10 @@ public class ImsUtListenerImplBase extends IImsUtListener.Stub {
		public void utConfigurationCallWaitingQueried(IImsUt ut, int id, ImsSsInfo[] cwInfo)
		throws RemoteException {
		}

		/**
		* Notifies client when Supplementary Service indication is received
		*/
		@Override
		public void onSupplementaryServiceIndication(ImsSsData ssData) {}
		}

telephony/java/com/android/ims/ImsReasonInfo.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,16 @@ public class ImsReasonInfo implements Parcelable {
		// and this capability is not supported by the network.
		public static final int CODE_IMEI_NOT_ACCEPTED = 243;

		//STK CC errors
		public static final int CODE_DIAL_MODIFIED_TO_USSD = 244;
		public static final int CODE_DIAL_MODIFIED_TO_SS = 245;
		public static final int CODE_DIAL_MODIFIED_TO_DIAL = 246;
		public static final int CODE_DIAL_MODIFIED_TO_DIAL_VIDEO = 247;
		public static final int CODE_DIAL_VIDEO_MODIFIED_TO_DIAL = 248;
		public static final int CODE_DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 249;
		public static final int CODE_DIAL_VIDEO_MODIFIED_TO_SS = 250;
		public static final int CODE_DIAL_VIDEO_MODIFIED_TO_USSD = 251;

		/**
		* STATUSCODE (SIP response code) (IMS -> Telephony)
		*/
		@@ -217,6 +227,11 @@ public class ImsReasonInfo implements Parcelable {
		public static final int CODE_UT_OPERATION_NOT_ALLOWED = 803;
		public static final int CODE_UT_NETWORK_ERROR = 804;
		public static final int CODE_UT_CB_PASSWORD_MISMATCH = 821;
		//STK CC errors
		public static final int CODE_UT_SS_MODIFIED_TO_DIAL = 822;
		public static final int CODE_UT_SS_MODIFIED_TO_USSD = 823;
		public static final int CODE_UT_SS_MODIFIED_TO_SS = 824;
		public static final int CODE_UT_SS_MODIFIED_TO_DIAL_VIDEO = 825;

		/**
		* ECBM