Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff5660c8 authored by Aishwarya Mallamapti's avatar Aishwarya Mallamapti
Browse files

Add MMS service type in NRI. 

Bug: 291997682
Test: Flashed build on raven-userdebug and performed basic functionality
tests
- atest CtsTelephonyTestCases
- atest FrameworkTelephonyTests

Change-Id: I37657cd6ddec1496cbe696e034b2d17ddc3ecb8d
parent 50e3809a

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44924,6 +44924,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

core/res/res/values/config_telephony.xml

+1 −0
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/CarrierConfigManager.java

+1 −0
Original line number Diff line number Diff line
@@ -9417,6 +9417,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>

     * If this carrier config is not present, the overlay config

telephony/java/android/telephony/NetworkRegistrationInfo.java

+8 −2
Original line number Diff line number Diff line
@@ -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;

    }