Merge "Add optional messageId methods for sending/receiving mms's" (8ed7418e) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -47070,8 +47070,8 @@ package android.telephony {
	}		}

	public class MmsManager {		public class MmsManager {
	method public void downloadMultimediaMessage(int, @NonNull String, @NonNull android.net.Uri, @Nullable android.os.Bundle, @Nullable android.app.PendingIntent);		method public void downloadMultimediaMessage(int, @NonNull String, @NonNull android.net.Uri, @Nullable android.os.Bundle, @Nullable android.app.PendingIntent, long);
	method public void sendMultimediaMessage(int, @NonNull android.net.Uri, @Nullable String, @Nullable android.os.Bundle, @Nullable android.app.PendingIntent);		method public void sendMultimediaMessage(int, @NonNull android.net.Uri, @Nullable String, @Nullable android.os.Bundle, @Nullable android.app.PendingIntent, long);
	}		}

	@Deprecated public class NeighboringCellInfo implements android.os.Parcelable {		@Deprecated public class NeighboringCellInfo implements android.os.Parcelable {

mms/java/android/telephony/MmsManager.java

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -55,10 +55,12 @@ public class MmsManager {
	* sending the message.		* sending the message.
	* @param sentIntent if not NULL this <code>PendingIntent</code> is broadcast when the message		* @param sentIntent if not NULL this <code>PendingIntent</code> is broadcast when the message
	* is successfully sent, or failed		* is successfully sent, or failed
			* @param messageId an id that uniquely identifies the message requested to be sent.
			* Used for logging and diagnostics purposes. The id may be 0.
	*/		*/
	public void sendMultimediaMessage(int subId, @NonNull Uri contentUri,		public void sendMultimediaMessage(int subId, @NonNull Uri contentUri,
	@Nullable String locationUrl, @Nullable Bundle configOverrides,		@Nullable String locationUrl, @Nullable Bundle configOverrides,
	@Nullable PendingIntent sentIntent) {		@Nullable PendingIntent sentIntent, long messageId) {
	try {		try {
	final IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms"));		final IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms"));
	if (iMms == null) {		if (iMms == null) {
	@@ -66,7 +68,7 @@ public class MmsManager {
	}		}

	iMms.sendMessage(subId, ActivityThread.currentPackageName(), contentUri,		iMms.sendMessage(subId, ActivityThread.currentPackageName(), contentUri,
	locationUrl, configOverrides, sentIntent);		locationUrl, configOverrides, sentIntent, messageId);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Ignore it		// Ignore it
	}		}
	@@ -83,18 +85,22 @@ public class MmsManager {
	* downloading the message.		* downloading the message.
	* @param downloadedIntent if not NULL this <code>PendingIntent</code> is		* @param downloadedIntent if not NULL this <code>PendingIntent</code> is
	* broadcast when the message is downloaded, or the download is failed		* broadcast when the message is downloaded, or the download is failed
			* @param messageId an id that uniquely identifies the message requested to be downloaded.
			* Used for logging and diagnostics purposes. The id may be 0.
			* downloaded.
	* @throws IllegalArgumentException if locationUrl or contentUri is empty		* @throws IllegalArgumentException if locationUrl or contentUri is empty
	*/		*/
	public void downloadMultimediaMessage(int subId, @NonNull String locationUrl,		public void downloadMultimediaMessage(int subId, @NonNull String locationUrl,
	@NonNull Uri contentUri, @Nullable Bundle configOverrides,		@NonNull Uri contentUri, @Nullable Bundle configOverrides,
	@Nullable PendingIntent downloadedIntent) {		@Nullable PendingIntent downloadedIntent, long messageId) {
	try {		try {
	final IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms"));		final IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms"));
	if (iMms == null) {		if (iMms == null) {
	return;		return;
	}		}
	iMms.downloadMessage(subId, ActivityThread.currentPackageName(),		iMms.downloadMessage(subId, ActivityThread.currentPackageName(),
	locationUrl, contentUri, configOverrides, downloadedIntent);		locationUrl, contentUri, configOverrides, downloadedIntent,
			messageId);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	// Ignore it		// Ignore it
	}		}

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

+6 −3

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

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -128,13 +128,15 @@ public class MmsServiceBroker extends SystemService {

	@Override		@Override
	public void sendMessage(int subId, String callingPkg, Uri contentUri, String locationUrl,		public void sendMessage(int subId, String callingPkg, Uri contentUri, String locationUrl,
	Bundle configOverrides, PendingIntent sentIntent) throws RemoteException {		Bundle configOverrides, PendingIntent sentIntent, long messageId)
			throws RemoteException {
	returnPendingIntentWithError(sentIntent);		returnPendingIntentWithError(sentIntent);
	}		}

	@Override		@Override
	public void downloadMessage(int subId, String callingPkg, String locationUrl,		public void downloadMessage(int subId, String callingPkg, String locationUrl,
	Uri contentUri, Bundle configOverrides, PendingIntent downloadedIntent)		Uri contentUri, Bundle configOverrides, PendingIntent downloadedIntent,
			long messageId)
	throws RemoteException {		throws RemoteException {
	returnPendingIntentWithError(downloadedIntent);		returnPendingIntentWithError(downloadedIntent);
	}		}
	@@ -329,7 +331,8 @@ public class MmsServiceBroker extends SystemService {

	@Override		@Override
	public void sendMessage(int subId, String callingPkg, Uri contentUri,		public void sendMessage(int subId, String callingPkg, Uri contentUri,
	String locationUrl, Bundle configOverrides, PendingIntent sentIntent)		String locationUrl, Bundle configOverrides, PendingIntent sentIntent,
			long messageId)
	throws RemoteException {		throws RemoteException {
	Slog.d(TAG, "sendMessage() by " + callingPkg);		Slog.d(TAG, "sendMessage() by " + callingPkg);
	mContext.enforceCallingPermission(Manifest.permission.SEND_SMS, "Send MMS message");		mContext.enforceCallingPermission(Manifest.permission.SEND_SMS, "Send MMS message");
	@@ -343,13 +346,13 @@ public class MmsServiceBroker extends SystemService {
	Intent.FLAG_GRANT_READ_URI_PERMISSION,		Intent.FLAG_GRANT_READ_URI_PERMISSION,
	subId);		subId);
	getServiceGuarded().sendMessage(subId, callingPkg, contentUri, locationUrl,		getServiceGuarded().sendMessage(subId, callingPkg, contentUri, locationUrl,
	configOverrides, sentIntent);		configOverrides, sentIntent, messageId);
	}		}

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

	getServiceGuarded().downloadMessage(subId, callingPkg, locationUrl, contentUri,		getServiceGuarded().downloadMessage(subId, callingPkg, locationUrl, contentUri,
	configOverrides, downloadedIntent);		configOverrides, downloadedIntent, messageId);
	}		}

	@Override		@Override

telephony/java/android/telephony/SmsManager.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2543,7 +2543,7 @@ public final class SmsManager {
	MmsManager m = (MmsManager) context.getSystemService(Context.MMS_SERVICE);		MmsManager m = (MmsManager) context.getSystemService(Context.MMS_SERVICE);
	if (m != null) {		if (m != null) {
	m.sendMultimediaMessage(getSubscriptionId(), contentUri, locationUrl, configOverrides,		m.sendMultimediaMessage(getSubscriptionId(), contentUri, locationUrl, configOverrides,
	sentIntent);		sentIntent, 0L /* messageId */);
	}		}
	}		}

	@@ -2581,7 +2581,7 @@ public final class SmsManager {
	MmsManager m = (MmsManager) context.getSystemService(Context.MMS_SERVICE);		MmsManager m = (MmsManager) context.getSystemService(Context.MMS_SERVICE);
	if (m != null) {		if (m != null) {
	m.downloadMultimediaMessage(getSubscriptionId(), locationUrl, contentUri,		m.downloadMultimediaMessage(getSubscriptionId(), locationUrl, contentUri,
	configOverrides, downloadedIntent);		configOverrides, downloadedIntent, 0L /* messageId */);
	}		}
	}		}