From 140ae7bdadd13d3b849385636e1811438e62ed6a Mon Sep 17 00:00:00 2001 From: Rika Brooks Date: Tue, 7 Aug 2012 14:51:19 -0700 Subject: Telephony: SMS over IMS Add RIL_REQUEST_IMS_REGISTRATION_STATE, RIL_REQUEST_IMS_SEND_SMS, and RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED. Add FORMAT_UNKNOWN to SmsConstants. Bug: 9626411 Change-Id: I87ca9841b4ace931c55e2d379fe6d7589b2dc8a5 Signed-off-by: Ed Tam --- .../java/com/android/internal/telephony/ISms.aidl | 22 ++++++++++++++++++++++ .../android/internal/telephony/RILConstants.java | 3 +++ .../android/internal/telephony/SmsConstants.java | 6 ++++++ 3 files changed, 31 insertions(+) diff --git a/telephony/java/com/android/internal/telephony/ISms.aidl b/telephony/java/com/android/internal/telephony/ISms.aidl index 647f014db83a..3e8db065ea1d 100644 --- a/telephony/java/com/android/internal/telephony/ISms.aidl +++ b/telephony/java/com/android/internal/telephony/ISms.aidl @@ -215,4 +215,26 @@ interface ISms { * Requires system permission. */ void setPremiumSmsPermission(String packageName, int permission); + + /** + * SMS over IMS is supported if IMS is registered and SMS is supported + * on IMS. + * + * @return true if SMS over IMS is supported, false otherwise + * + * @see #getImsSmsFormat() + */ + boolean isImsSmsSupported(); + + /** + * Gets SMS format supported on IMS. SMS over IMS format is + * either 3GPP or 3GPP2. + * + * @return android.telephony.SmsMessage.FORMAT_3GPP, + * android.telephony.SmsMessage.FORMAT_3GPP2 + * or android.telephony.SmsMessage.FORMAT_UNKNOWN + * + * @see #isImsSmsSupported() + */ + String getImsSmsFormat(); } diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 923fef280867..821a11cb3b0b 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -263,6 +263,8 @@ cat include/telephony/ril.h | \ int RIL_REQUEST_GET_CELL_INFO_LIST = 109; int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110; int RIL_REQUEST_SET_INITIAL_ATTACH_APN = 111; + int RIL_REQUEST_IMS_REGISTRATION_STATE = 112; + int RIL_REQUEST_IMS_SEND_SMS = 113; int RIL_UNSOL_RESPONSE_BASE = 1000; int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000; int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001; @@ -301,4 +303,5 @@ cat include/telephony/ril.h | \ int RIL_UNSOL_RIL_CONNECTED = 1034; int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035; int RIL_UNSOL_CELL_INFO_LIST = 1036; + int RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED = 1037; } diff --git a/telephony/java/com/android/internal/telephony/SmsConstants.java b/telephony/java/com/android/internal/telephony/SmsConstants.java index 1ccdc3b24eef..2449108f22c4 100644 --- a/telephony/java/com/android/internal/telephony/SmsConstants.java +++ b/telephony/java/com/android/internal/telephony/SmsConstants.java @@ -61,6 +61,12 @@ public class SmsConstants { UNKNOWN, CLASS_0, CLASS_1, CLASS_2, CLASS_3; } + /** + * Indicates unknown format SMS message. + * @hide pending API council approval + */ + public static final String FORMAT_UNKNOWN = "unknown"; + /** * Indicates a 3GPP format SMS message. * @hide pending API council approval -- cgit v1.2.3-59-g8ed1b