Merge "Remove Mainline APIs for MmsManger and TelephonyManager" into rvc-dev... (8abf9e05) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -10205,7 +10205,6 @@ package android.content {
		field public static final String MEDIA_ROUTER_SERVICE = "media_router";
		field public static final String MEDIA_SESSION_SERVICE = "media_session";
		field public static final String MIDI_SERVICE = "midi";
		field public static final String MMS_SERVICE = "mms";
		field public static final int MODE_APPEND = 32768; // 0x8000
		field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
		field @Deprecated public static final int MODE_MULTI_PROCESS = 4; // 0x4
		@@ -47548,11 +47547,6 @@ package android.telephony {
		method @Nullable public android.telephony.mbms.StreamingService startStreaming(android.telephony.mbms.StreamingServiceInfo, @NonNull java.util.concurrent.Executor, android.telephony.mbms.StreamingServiceCallback);
		}

		public class MmsManager {
		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, long);
		}

		@Deprecated public class NeighboringCellInfo implements android.os.Parcelable {
		ctor @Deprecated public NeighboringCellInfo();
		ctor @Deprecated public NeighboringCellInfo(int, int);

+0 −3

Original line number	Diff line number	Diff line
		@@ -11570,9 +11570,6 @@ package android.telephony {
		field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";
		field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";
		field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";
		field public static final int CARD_POWER_DOWN = 0; // 0x0
		field public static final int CARD_POWER_UP = 1; // 0x1
		field public static final int CARD_POWER_UP_PASS_THROUGH = 2; // 0x2
		field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe
		field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1
		field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0

+2 −1

Original line number	Diff line number	Diff line
		@@ -3430,7 +3430,7 @@ public abstract class Context {
		TELEPHONY_SUBSCRIPTION_SERVICE,
		CARRIER_CONFIG_SERVICE,
		EUICC_SERVICE,
		MMS_SERVICE,
		//@hide: MMS_SERVICE,
		TELECOM_SERVICE,
		CLIPBOARD_SERVICE,
		INPUT_METHOD_SERVICE,
		@@ -4344,6 +4344,7 @@ public abstract class Context {
		*
		* @see #getSystemService(String)
		* @see android.telephony.MmsManager
		* @hide
		*/
		public static final String MMS_SERVICE = "mms";

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import com.android.internal.telephony.IMms;
		/**
		* Manages MMS operations such as sending multimedia messages.
		* Get this object by calling Context#getSystemService(Context#MMS_SERVICE).
		* @hide
		*/
		@SystemService(Context.MMS_SERVICE)
		public class MmsManager {

+0 −3

Original line number	Diff line number	Diff line
		@@ -882,9 +882,6 @@ package android.telephony {
		field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";
		field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";
		field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";
		field public static final int CARD_POWER_DOWN = 0; // 0x0
		field public static final int CARD_POWER_UP = 1; // 0x1
		field public static final int CARD_POWER_UP_PASS_THROUGH = 2; // 0x2
		field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe
		field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1
		field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0