drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev

Browse Source 
* commit '00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
  Telephony: SMS over IMS, DO NOT MERGE
This commit is contained in:
Ed Tam
2013-08-30 14:06:47 -07:00
committed by Android Git Automerger
parent ee9d38ff24 00e4c6721b
commit 468c60b334
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
telephony/java/com/android/internal/telephony/ISms.aidl
View File

@ -1,5 +1,6 @@
/* /*
** Copyright 2007, The Android Open Source Project ** 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"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.
@ -215,4 +216,26 @@ interface ISms {
* Requires system permission. * Requires system permission.
*/ */
void setPremiumSmsPermission(String packageName, int 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();
} }

4
telephony/java/com/android/internal/telephony/RILConstants.java
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2006 The Android Open Source Project * 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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_VOICE_RADIO_TECH = 108;
int RIL_REQUEST_GET_CELL_INFO_LIST = 109; int RIL_REQUEST_GET_CELL_INFO_LIST = 109;
int RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110; 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_BASE = 1000;
int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000; int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;
int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001; 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_RIL_CONNECTED = 1034;
int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035; int RIL_UNSOL_VOICE_RADIO_TECH_CHANGED = 1035;
int RIL_UNSOL_CELL_INFO_LIST = 1036; int RIL_UNSOL_CELL_INFO_LIST = 1036;
int RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED = 1037;
} }

7
telephony/java/com/android/internal/telephony/SmsConstants.java
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2012 The Android Open Source Project * 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -61,6 +62,12 @@ public class SmsConstants {
UNKNOWN, CLASS_0, CLASS_1, CLASS_2, CLASS_3; 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. * Indicates a 3GPP format SMS message.
* @hide pending API council approval * @hide pending API council approval