diff options
| author | Ed Tam <etam@google.com> | 2013-08-30 14:06:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-30 14:06:47 -0700 |
| commit | 468c60b334321d5790b0b5bd962870939aac0ab2 (patch) | |
| tree | d7530853b4831789a7ce953ccf323c2eb811fab3 /telephony | |
| parent | ee9d38ff24358774d194108128e99f09d08ddf8e (diff) | |
| parent | 00e4c6721b344eca1d8b0de0e82e5de6f4f21f16 (diff) | |
| download | frameworks_base-468c60b334321d5790b0b5bd962870939aac0ab2.zip frameworks_base-468c60b334321d5790b0b5bd962870939aac0ab2.tar.gz frameworks_base-468c60b334321d5790b0b5bd962870939aac0ab2.tar.bz2 | |
am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
Telephony: SMS over IMS, DO NOT MERGE
Diffstat (limited to 'telephony')
3 files changed, 34 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/ISms.aidl b/telephony/java/com/android/internal/telephony/ISms.aidl index 647f014..828e025 100644 --- a/telephony/java/com/android/internal/telephony/ISms.aidl +++ b/telephony/java/com/android/internal/telephony/ISms.aidl @@ -1,5 +1,6 @@ /* ** Copyright 2007, The Android Open Source Project +** Copyright (c) 2012, The Linux Foundation. All rights reserved. ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -215,4 +216,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 9650b99..5a7f13a 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2006 The Android Open Source Project + * Copyright (c) 2012, The Linux Foundation. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -262,6 +263,8 @@ cat include/telephony/ril.h | \ int RIL_REQUEST_VOICE_RADIO_TECH = 108; int RIL_REQUEST_GET_CELL_INFO_LIST = 109; int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110; + int RIL_REQUEST_IMS_REGISTRATION_STATE = 111; + int RIL_REQUEST_IMS_SEND_SMS = 112; int RIL_UNSOL_RESPONSE_BASE = 1000; int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000; int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001; @@ -300,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 1ccdc3b..a36697a 100644 --- a/telephony/java/com/android/internal/telephony/SmsConstants.java +++ b/telephony/java/com/android/internal/telephony/SmsConstants.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 The Android Open Source Project + * Copyright (c) 2012, The Linux Foundation. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,6 +63,12 @@ public class SmsConstants { } /** + * 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 */ |