am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev (00e4c672) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/ISms.aidl

+23 −0

Original line number	Diff line number	Diff line
		/*
		** 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();
		}

+4 −0

Original line number	Diff line number	Diff line
		/*
		* 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;
		}

+7 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		@@ -61,6 +62,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