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

Commit 94cba63f authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Extract hostname if mMmsProxyAddress starts with 

http.

Bug: 226279832
Test: atest
com.android.internal.telephony.dataconnection.ApnSettingTest#testBuild_mmsProxyAddrStartsWithHttp
Change-Id: I3cf4a23ab6d6f7f21116ec591b11ec1c8a798f51

Change-Id: Ic05c39c8c86294564e65c4d0ab0ee263abe03fb3
parent 63b1b3a8

tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java

+50 −0
Original line number Diff line number Diff line
@@ -540,4 +540,54 @@ public class ApnSettingTest extends TelephonyTest { 


        parcel.recycle();

    }



    @Test

    public void testBuild_mmsProxyAddrStartsWithHttp() {

        ApnSetting apn1 = new ApnSetting.Builder()

                .setId(1234)

                .setOperatorNumeric("310260")

                .setEntryName("mms")

                .setApnName("mms")

                .setApnTypeBitmask(ApnSetting.TYPE_MMS)

                .setProtocol(ApnSetting.PROTOCOL_IPV6)

                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_LTE

                        | TelephonyManager.NETWORK_TYPE_BITMASK_UMTS))

                .setMtuV4(1440)

                .setCarrierEnabled(true)

                .setMmsProxyAddress("http://proxy.mobile.att.net")

                .build();

        assertEquals("proxy.mobile.att.net", apn1.getMmsProxyAddressAsString());



        ApnSetting apn2 = new ApnSetting.Builder()

                .setId(1235)

                .setOperatorNumeric("310260")

                .setEntryName("mms")

                .setApnName("mms")

                .setApnTypeBitmask(ApnSetting.TYPE_MMS)

                .setProtocol(ApnSetting.PROTOCOL_IPV6)

                .setRoamingProtocol(ApnSetting.PROTOCOL_IPV6)

                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_EDGE

                        | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS))

                .setMtuV4(1440)

                .setCarrierEnabled(true)

                .setMmsProxyAddress("https://proxy.mobile.att.net")

                .build();

        assertEquals("proxy.mobile.att.net", apn2.getMmsProxyAddressAsString());



        ApnSetting apn3 = new ApnSetting.Builder()

                .setId(1236)

                .setOperatorNumeric("310260")

                .setEntryName("mms")

                .setApnName("mms")

                .setApnTypeBitmask(ApnSetting.TYPE_MMS)

                .setProtocol(ApnSetting.PROTOCOL_IPV6)

                .setRoamingProtocol(ApnSetting.PROTOCOL_IPV6)

                .setNetworkTypeBitmask((int) (TelephonyManager.NETWORK_TYPE_BITMASK_EDGE

                        | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS))

                .setMtuV4(1440)

                .setCarrierEnabled(true)

                .setMmsProxyAddress("proxy.mobile.att.net")

                .build();

        assertEquals("proxy.mobile.att.net", apn3.getMmsProxyAddressAsString());

    }

}