Merge "Remove unused @hide APIs from SmsManager." (4d4d2b36) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/MmsManager.java

0 → 100644

+118 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.telephony;

		import android.app.ActivityThread;
		import android.app.PendingIntent;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.ServiceManager;

		import com.android.internal.telephony.IMms;

		/**
		* Manages MMS operations such as sending multimedia messages.
		* Get this object by calling the static method {@link #getInstance()}.
		* @hide
		*/
		public class MmsManager {
		private static final String TAG = "MmsManager";

		/** Singleton object constructed during class initialization. */
		private static final MmsManager sInstance = new MmsManager();

		/**
		* Get the MmsManager singleton instance.
		*
		* @return the {@link MmsManager} singleton instance.
		*/
		public static MmsManager getInstance() {
		return sInstance;
		}

		/**
		* Send an MMS message
		*
		* @param subId the subscription id
		* @param contentUri the content Uri from which the message pdu will be read
		* @param locationUrl the optional location url where message should be sent to
		* @param configOverrides the carrier-specific messaging configuration values to override for
		* sending the message.
		* @param sentIntent if not NULL this <code>PendingIntent</code> is broadcast when the message
		* is successfully sent, or failed
		*/
		public void sendMultimediaMessage(int subId, Uri contentUri, String locationUrl,
		Bundle configOverrides, PendingIntent sentIntent) {
		try {
		final IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms"));
		if (iMms == null) {
		return;
		}

		iMms.sendMessage(subId, ActivityThread.currentPackageName(), contentUri,
		locationUrl, configOverrides, sentIntent);
		} catch (RemoteException e) {
		// Ignore it
		}
		}

		/**
		* Download an MMS message from carrier by a given location URL
		*
		* @param subId the subscription id
		* @param locationUrl the location URL of the MMS message to be downloaded, usually obtained
		* from the MMS WAP push notification
		* @param contentUri the content uri to which the downloaded pdu will be written
		* @param configOverrides the carrier-specific messaging configuration values to override for
		* downloading the message.
		* @param downloadedIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is downloaded, or the download is failed
		* @throws IllegalArgumentException if locationUrl or contentUri is empty
		*/
		public void downloadMultimediaMessage(int subId, String locationUrl, Uri contentUri,
		Bundle configOverrides, PendingIntent downloadedIntent) {
		try {
		final IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms"));
		if (iMms == null) {
		return;
		}
		iMms.downloadMessage(subId, ActivityThread.currentPackageName(),
		locationUrl, contentUri, configOverrides, downloadedIntent);
		} catch (RemoteException e) {
		// Ignore it
		}
		}

		/**
		* Get carrier-dependent configuration values.
		*
		* @param subId the subscription id
		* @return bundle key/values pairs of configuration values
		*/
		public Bundle getCarrierConfigValues(int subId) {
		try {
		IMms iMms = IMms.Stub.asInterface(ServiceManager.getService("imms"));
		if (iMms != null) {
		return iMms.getCarrierConfigValues(subId);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		return null;
		}
		}

telephony/java/android/telephony/SmsManager.java

+111 −763

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/com/android/internal/telephony/SmsApplication.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import android.os.UserHandle;
		import android.provider.Telephony;
		import android.provider.Telephony.Sms.Intents;
		import android.telephony.Rlog;
		import android.telephony.SmsManager;
		import android.telephony.TelephonyManager;
		import android.util.Log;

		@@ -1037,9 +1036,6 @@ public final class SmsApplication {
		* Caller must pass in the correct user context if calling from a singleton service.
		*/
		public static boolean shouldWriteMessageForPackage(String packageName, Context context) {
		if (SmsManager.getDefault().getAutoPersisting()) {
		return true;
		}
		return !isDefaultSmsApplication(context, packageName);
		}