diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/config_telephony.xml | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/NetworkRegistrationInfo.java | 10 |
4 files changed, 11 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 0d9633e17376..f40cbb61d4a3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -45003,6 +45003,7 @@ package android.telephony { field public static final int NR_STATE_RESTRICTED = 1; // 0x1 field public static final int SERVICE_TYPE_DATA = 2; // 0x2 field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5 + field public static final int SERVICE_TYPE_MMS = 6; // 0x6 field public static final int SERVICE_TYPE_SMS = 3; // 0x3 field public static final int SERVICE_TYPE_UNKNOWN = 0; // 0x0 field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4 diff --git a/core/res/res/values/config_telephony.xml b/core/res/res/values/config_telephony.xml index 18abe7073757..bda194add759 100644 --- a/core/res/res/values/config_telephony.xml +++ b/core/res/res/values/config_telephony.xml @@ -160,6 +160,7 @@ 3 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_SMS} 4 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_VIDEO} 5 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_EMERGENCY} + 6 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_MMS} Example of a config string: "10011:2,3" The PLMNs not configured in this array will be ignored and will not be used for satellite diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 314150b3f58c..4907134ffe1f 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -9418,6 +9418,7 @@ public class CarrierConfigManager { * <li>3 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_SMS}</li> * <li>4 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_VIDEO}</li> * <li>5 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_EMERGENCY}</li> + * <li>6 = {@link android.telephony.NetworkRegistrationInfo#SERVICE_TYPE_MMS}</li> * </ul> * <p> * An example config for two PLMNs "123411" and "123412": diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java index 6258b9c74282..631013fc485e 100644 --- a/telephony/java/android/telephony/NetworkRegistrationInfo.java +++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java @@ -170,7 +170,7 @@ public final class NetworkRegistrationInfo implements Parcelable { @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = "SERVICE_TYPE_", value = {SERVICE_TYPE_UNKNOWN, SERVICE_TYPE_VOICE, SERVICE_TYPE_DATA, SERVICE_TYPE_SMS, - SERVICE_TYPE_VIDEO, SERVICE_TYPE_EMERGENCY}) + SERVICE_TYPE_VIDEO, SERVICE_TYPE_EMERGENCY, SERVICE_TYPE_MMS}) public @interface ServiceType {} /** @@ -203,11 +203,16 @@ public final class NetworkRegistrationInfo implements Parcelable { */ public static final int SERVICE_TYPE_EMERGENCY = 5; + /** + * MMS service + */ + public static final int SERVICE_TYPE_MMS = 6; + /** @hide */ public static final int FIRST_SERVICE_TYPE = SERVICE_TYPE_VOICE; /** @hide */ - public static final int LAST_SERVICE_TYPE = SERVICE_TYPE_EMERGENCY; + public static final int LAST_SERVICE_TYPE = SERVICE_TYPE_MMS; @Domain private final int mDomain; @@ -739,6 +744,7 @@ public final class NetworkRegistrationInfo implements Parcelable { case SERVICE_TYPE_SMS: return "SMS"; case SERVICE_TYPE_VIDEO: return "VIDEO"; case SERVICE_TYPE_EMERGENCY: return "EMERGENCY"; + case SERVICE_TYPE_MMS: return "MMS"; } return "Unknown service type " + serviceType; } |