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

Commit 1d0661a1 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Set data profile as 3GPP2 only if it is exclusive for cdma" am: ab6d2ca7 am: df4799eb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1663520

Change-Id: Ieaecc21a702439bd25d0bd0df60c5d7d63371574
parents acb75d0e df4799eb

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+6 −2
Original line number Diff line number Diff line
@@ -5289,10 +5289,14 @@ public class DcTracker extends Handler { 


        if (networkTypeBitmask == 0) {

            profileType = DataProfile.TYPE_COMMON;

        } else if (ServiceState.bearerBitmapHasCdma(networkTypeBitmask)) {

        } else if ((networkTypeBitmask & TelephonyManager.NETWORK_STANDARDS_FAMILY_BITMASK_3GPP2)

                == networkTypeBitmask) {

            profileType = DataProfile.TYPE_3GPP2;

        } else {

        } else if ((networkTypeBitmask & TelephonyManager.NETWORK_STANDARDS_FAMILY_BITMASK_3GPP)

                == networkTypeBitmask) {

            profileType = DataProfile.TYPE_3GPP;

        } else {

            profileType = DataProfile.TYPE_COMMON;

        }



        return new DataProfile.Builder()

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

+30 −1
Original line number Diff line number Diff line
@@ -107,6 +107,33 @@ public class DataProfileTest extends TestCase { 
            -1,                     // mvno_type

            "");                    // mnvo_match_data



    private ApnSetting mApn4 = ApnSetting.makeApnSetting(

            2163,                   // id

            "44010",                // numeric

            "sp-mode",              // name

            "fake_apn",             // apn

            null,                   // proxy

            -1,                     // port

            null,                   // mmsc

            null,                   // mmsproxy

            -1,                     // mmsport

            "user",                 // user

            "passwd",               // password

            -1,                     // authtype

            ApnSetting.TYPE_DEFAULT | ApnSetting.TYPE_SUPL,   // types

            ApnSetting.PROTOCOL_IP,                 // protocol

            ApnSetting.PROTOCOL_IP,                 // roaming_protocol

            true,                   // carrier_enabled

            10360,                  // networktype_bitmask

            1234,                   // profile_id

            false,                  // modem_cognitive

            111,                    // max_conns

            456,                    // wait_time

            789,                    // max_conns_time

            0,                      // mtu

            -1,                     // mvno_type

            "");                    // mnvo_match_data



    @SmallTest

    public void testCreateFromApnSetting() throws Exception {

        DataProfile dp = DcTracker.createDataProfile(mApn1, mApn1.getProfileId(), false);
@@ -132,11 +159,13 @@ public class DataProfileTest extends TestCase { 
        assertEquals(RILConstants.SETUP_DATA_AUTH_PAP_CHAP, dp.getAuthType());

        assertEquals(mApn3.getUser(), dp.getUserName());

        assertEquals(mApn3.getPassword(), dp.getPassword());

        assertEquals(2, dp.getType());  // TYPE_3GPP2

        assertEquals(0, dp.getType());  // TYPE_COMMON

        assertEquals(mApn3.getWaitTime(), dp.getWaitTime());

        assertEquals(mApn3.isEnabled(), dp.isEnabled());

        int expectedBearerBitmap = mApn3.getNetworkTypeBitmask();

        assertEquals(expectedBearerBitmap, dp.getBearerBitmask());

        dp = DcTracker.createDataProfile(mApn4, mApn4.getProfileId(), false);

        assertEquals(2, dp.getType());  // TYPE_3GPP2

    }



    @SmallTest