diff options
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rwxr-xr-x | api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 3 | ||||
| -rw-r--r-- | mms/java/android/telephony/MmsManager.java | 1 | ||||
| -rw-r--r-- | telephony/api/system-current.txt | 3 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 3 |
6 files changed, 3 insertions, 16 deletions
diff --git a/api/current.txt b/api/current.txt index 3d1b4374f966..72e4761d971f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 @@ -47554,11 +47553,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); diff --git a/api/system-current.txt b/api/system-current.txt index c2a02af26192..5b282cfc0c06 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11576,9 +11576,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 diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 85bdfab2cd3e..86a2cce460fa 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -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"; diff --git a/mms/java/android/telephony/MmsManager.java b/mms/java/android/telephony/MmsManager.java index 805c6db7bcf2..d541da09f45d 100644 --- a/mms/java/android/telephony/MmsManager.java +++ b/mms/java/android/telephony/MmsManager.java @@ -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 { diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index 639f3138a827..7a70ffd1c64b 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -880,9 +880,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 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index cce477e72ba3..9997b3e43b41 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -9725,14 +9725,12 @@ public class TelephonyManager { * Powers down the SIM. SIM must be up prior. * @hide */ - @SystemApi public static final int CARD_POWER_DOWN = 0; /** * Powers up the SIM normally. SIM must be down prior. * @hide */ - @SystemApi public static final int CARD_POWER_UP = 1; /** @@ -9750,7 +9748,6 @@ public class TelephonyManager { * is NOT persistent across boots. On reboot, SIM will power up normally. * @hide */ - @SystemApi public static final int CARD_POWER_UP_PASS_THROUGH = 2; /** |