Merge "MMS API cleanup (1/4)" into lmp-dev (70afe9ee) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −20

Original line number	Diff line number	Diff line
		@@ -28870,35 +28870,21 @@ package android.telephony {
		}

		public final class SmsManager {
		method public android.net.Uri addMultimediaMessageDraft(android.net.Uri);
		method public android.net.Uri addTextMessageDraft(java.lang.String, java.lang.String);
		method public boolean archiveStoredConversation(long, boolean);
		method public boolean deleteStoredConversation(long);
		method public boolean deleteStoredMessage(android.net.Uri);
		method public java.util.ArrayList<java.lang.String> divideMessage(java.lang.String);
		method public void downloadMultimediaMessage(java.lang.String, android.net.Uri, android.content.ContentValues, android.app.PendingIntent);
		method public boolean getAutoPersisting();
		method public void downloadMultimediaMessage(java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent);
		method public android.os.Bundle getCarrierConfigValues();
		method public static android.telephony.SmsManager getDefault();
		method public static android.telephony.SmsManager getSmsManagerUsingSubId(long);
		method public long getSubId();
		method public android.net.Uri importMultimediaMessage(android.net.Uri, java.lang.String, long, boolean, boolean);
		method public android.net.Uri importTextMessage(java.lang.String, int, java.lang.String, long, boolean, boolean);
		method public void injectSmsPdu(byte[], java.lang.String, android.app.PendingIntent);
		method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent);
		method public void sendMultimediaMessage(android.net.Uri, java.lang.String, android.content.ContentValues, android.app.PendingIntent);
		method public void sendMultimediaMessage(android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent);
		method public void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);
		method public void sendStoredMultimediaMessage(android.net.Uri, android.content.ContentValues, android.app.PendingIntent);
		method public void sendStoredMultipartTextMessage(android.net.Uri, java.lang.String, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);
		method public void sendStoredTextMessage(android.net.Uri, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);
		method public void sendTextMessage(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);
		method public void setAutoPersisting(boolean);
		method public void updateMmsDownloadStatus(int, byte[]);
		method public void updateMmsSendStatus(int, boolean);
		method public void updateSmsSendStatus(int, boolean);
		method public boolean updateStoredMessageStatus(android.net.Uri, android.content.ContentValues);
		field public static final java.lang.String MESSAGE_STATUS_READ = "read";
		field public static final java.lang.String MESSAGE_STATUS_SEEN = "seen";
		field public static final java.lang.String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA";
		field public static final java.lang.String MMS_CONFIG_ALIAS_ENABLED = "aliasEnabled";
		field public static final java.lang.String MMS_CONFIG_ALIAS_MAX_CHARS = "aliasMaxChars";
		field public static final java.lang.String MMS_CONFIG_ALIAS_MIN_CHARS = "aliasMinChars";
		@@ -28933,13 +28919,10 @@ package android.telephony {
		field public static final int MMS_ERROR_IO_ERROR = 5; // 0x5
		field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3
		field public static final int MMS_ERROR_UNSPECIFIED = 1; // 0x1
		field public static final java.lang.String MMS_EXTRA_DATA = "data";
		field public static final int RESULT_ERROR_GENERIC_FAILURE = 1; // 0x1
		field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4
		field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3
		field public static final int RESULT_ERROR_RADIO_OFF = 2; // 0x2
		field public static final int SMS_TYPE_INCOMING = 0; // 0x0
		field public static final int SMS_TYPE_OUTGOING = 1; // 0x1
		field public static final int STATUS_ON_ICC_FREE = 0; // 0x0
		field public static final int STATUS_ON_ICC_READ = 1; // 0x1
		field public static final int STATUS_ON_ICC_SENT = 5; // 0x5

services/core/java/com/android/server/MmsServiceBroker.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ public class MmsServiceBroker extends SystemService {
		private final class BinderService extends IMms.Stub {
		@Override
		public void sendMessage(long subId, String callingPkg, Uri contentUri,
		String locationUrl, ContentValues configOverrides, PendingIntent sentIntent)
		String locationUrl, Bundle configOverrides, PendingIntent sentIntent)
		throws RemoteException {
		mContext.enforceCallingPermission(Manifest.permission.SEND_SMS, "Send MMS message");
		if (getAppOpsManager().noteOp(AppOpsManager.OP_SEND_SMS, Binder.getCallingUid(),
		@@ -206,7 +206,7 @@ public class MmsServiceBroker extends SystemService {

		@Override
		public void downloadMessage(long subId, String callingPkg, String locationUrl,
		Uri contentUri, ContentValues configOverrides,
		Uri contentUri, Bundle configOverrides,
		PendingIntent downloadedIntent) throws RemoteException {
		mContext.enforceCallingPermission(Manifest.permission.RECEIVE_MMS,
		"Download MMS message");
		@@ -333,7 +333,7 @@ public class MmsServiceBroker extends SystemService {

		@Override
		public void sendStoredMessage(long subId, String callingPkg, Uri messageUri,
		ContentValues configOverrides, PendingIntent sentIntent) throws RemoteException {
		Bundle configOverrides, PendingIntent sentIntent) throws RemoteException {
		mContext.enforceCallingPermission(Manifest.permission.SEND_SMS,
		"Send stored MMS message");
		if (getAppOpsManager().noteOp(AppOpsManager.OP_SEND_SMS, Binder.getCallingUid(),

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ interface IMms {
		* broadcast when the message is successfully sent, or failed
		*/
		void sendMessage(long subId, String callingPkg, in Uri contentUri,
		String locationUrl, in ContentValues configOverrides, in PendingIntent sentIntent);
		String locationUrl, in Bundle configOverrides, in PendingIntent sentIntent);

		/**
		* Download an MMS message using known location and transaction id
		@@ -57,7 +57,7 @@ interface IMms {
		* broadcast when the message is downloaded, or the download is failed
		*/
		void downloadMessage(long subId, String callingPkg, String locationUrl,
		in Uri contentUri, in ContentValues configOverrides,
		in Uri contentUri, in Bundle configOverrides,
		in PendingIntent downloadedIntent);

		/**
		@@ -192,7 +192,7 @@ interface IMms {
		* broadcast when the message is successfully sent, or failed
		*/
		void sendStoredMessage(long subId, String callingPkg, in Uri messageUri,
		in ContentValues configOverrides, in PendingIntent sentIntent);
		in Bundle configOverrides, in PendingIntent sentIntent);

		/**
		* Turns on/off the flag to automatically write sent/received SMS/MMS messages into system