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

Commit 536c1c50 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev

parents 3b4a4928 05cf1be4

src/java/com/android/internal/telephony/NetworkTypeController.java

+21 −18
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ public class NetworkTypeController extends StateMachine { 
                if (kv[1].equals(ICON_5G)) {

                    icon = TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA;

                } else if (kv[1].equals(ICON_5G_PLUS)) {

                    icon = TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE;

                    icon = TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED;

                } else {

                    if (DBG) loge("Invalid 5G icon = " + kv[1]);

                }
@@ -367,7 +367,7 @@ public class NetworkTypeController extends StateMachine { 
        // NR display is not accurate when physical channel config notifications are off

        if (mIsPhysicalChannelConfigOn && (nrNsa || nrSa)) {

            // Process NR display network type

            displayNetworkType = getNrDisplayType();

            displayNetworkType = getNrDisplayType(nrSa);

            if (displayNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE) {

                // Use LTE values if 5G values aren't defined

                displayNetworkType = getLteDisplayType();
@@ -379,7 +379,7 @@ public class NetworkTypeController extends StateMachine { 
        return displayNetworkType;

    }



    private @Annotation.OverrideNetworkType int getNrDisplayType() {

    private @Annotation.OverrideNetworkType int getNrDisplayType(boolean isNrSa) {

        // Don't show 5G icon if preferred network type does not include 5G

        if ((mPhone.getCachedAllowedNetworkTypesBitmask()

                & TelephonyManager.NETWORK_TYPE_BITMASK_NR) == 0) {
@@ -387,7 +387,9 @@ public class NetworkTypeController extends StateMachine { 
        }

        // Icon display keys in order of priority

        List<String> keys = new ArrayList<>();

        // TODO: Update for NR SA

        if (isNrSa && isNrMmwave()) {

            keys.add(STATE_CONNECTED_MMWAVE);

        } else {

            switch (mPhone.getServiceState().getNrState()) {

                case NetworkRegistrationInfo.NR_STATE_CONNECTED:

                    if (isNrMmwave()) {
@@ -403,6 +405,7 @@ public class NetworkTypeController extends StateMachine { 
                    keys.add(STATE_RESTRICTED);

                    break;

            }

        }



        for (String key : keys) {

            OverrideTimerRule rule = mOverrideTimerRules.get(key);

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

+4 −4
Original line number Diff line number Diff line
@@ -4297,7 +4297,7 @@ public class DcTracker extends Handler { 


        if (isNetworkTypeUnmetered(NETWORK_TYPE_NR)) {

            if (mNrNsaMmwaveUnmetered) {

                if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE) {

                if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED) {

                    if (DBG) log("NR unmetered for mmwave only");

                    return true;

                }
@@ -4309,7 +4309,7 @@ public class DcTracker extends Handler { 
                }

                return false;

            }

            if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE

            if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED

                    || override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA

                    || rat == NETWORK_TYPE_NR) {

                if (DBG) log("NR unmetered for all frequencies");
@@ -4320,7 +4320,7 @@ public class DcTracker extends Handler { 


        if (mNrNsaAllUnmetered) {

            if (mNrNsaMmwaveUnmetered) {

                if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE) {

                if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED) {

                    if (DBG) log("NR NSA unmetered for mmwave only via carrier configs");

                    return true;

                }
@@ -4332,7 +4332,7 @@ public class DcTracker extends Handler { 
                }

                return false;

            }

            if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE

            if (override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED

                    || override == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) {

                if (DBG) log("NR NSA unmetered for all frequencies via carrier configs");

                return true;

tests/telephonytests/src/com/android/internal/telephony/NetworkTypeControllerTest.java

+62 −15
Original line number Diff line number Diff line
@@ -140,7 +140,54 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        // NR NSA, millimeter wave frequency

        doReturn(ServiceState.FREQUENCY_RANGE_MMWAVE).when(mServiceState).getNrFrequencyRange();

        updateOverrideNetworkType();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

    }



    @Test

    public void testUpdateOverrideNetworkTypeNrSa() throws Exception {

        // not NR

        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();

        doReturn(NetworkRegistrationInfo.NR_STATE_NONE).when(mServiceState).getNrState();

        updateOverrideNetworkType();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                mNetworkTypeController.getOverrideNetworkType());



        // NR SA connected

        mNetworkRegistrationInfo = new NetworkRegistrationInfo.Builder()

                .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_NR)

                .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)

                .build();

        doReturn(mNetworkRegistrationInfo).when(mServiceState).getNetworkRegistrationInfo(

                anyInt(), anyInt());



        updateOverrideNetworkType();



        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                mNetworkTypeController.getOverrideNetworkType());

    }



    @Test

    public void testUpdateOverrideNetworkTypeNrSaMmwave() throws Exception {

        // not NR

        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();

        doReturn(NetworkRegistrationInfo.NR_STATE_NONE).when(mServiceState).getNrState();

        updateOverrideNetworkType();

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                mNetworkTypeController.getOverrideNetworkType());



        // NR SA connected and millimeter wave frequency

        mNetworkRegistrationInfo = new NetworkRegistrationInfo.Builder()

                .setAccessNetworkTechnology(TelephonyManager.NETWORK_TYPE_NR)

                .setRegistrationState(NetworkRegistrationInfo.REGISTRATION_STATE_HOME)

                .build();

        doReturn(mNetworkRegistrationInfo).when(mServiceState).getNetworkRegistrationInfo(

                anyInt(), anyInt());

        doReturn(ServiceState.FREQUENCY_RANGE_MMWAVE).when(mServiceState).getNrFrequencyRange();



        updateOverrideNetworkType();



        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

    }
@@ -456,7 +503,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        broadcastCarrierConfigs();



        assertEquals("connected_mmwave", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());



        // should trigger 10 second timer
@@ -465,7 +512,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        processAllMessages();



        assertEquals("connected", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertTrue(mNetworkTypeController.is5GHysteresisActive());
@@ -489,7 +536,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        broadcastCarrierConfigs();



        assertEquals("connected_mmwave", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());



        // trigger 10 second timer after disconnecting from NR
@@ -498,7 +545,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        processAllMessages();



        assertEquals("connected", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertTrue(mNetworkTypeController.is5GHysteresisActive());
@@ -512,7 +559,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


        // timer should not have gone off

        assertEquals("connected_mmwave", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertFalse(mNetworkTypeController.is5GHysteresisActive());

    }
@@ -622,7 +669,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        broadcastCarrierConfigs();



        assertEquals("connected_mmwave", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());



        // should trigger 10 second primary timer
@@ -631,7 +678,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        processAllMessages();



        assertEquals("connected", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertTrue(mNetworkTypeController.is5GHysteresisActive());
@@ -641,7 +688,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


        // should trigger 30 second secondary timer

        assertEquals("connected", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertTrue(mNetworkTypeController.is5GHysteresisActive());
@@ -667,7 +714,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        broadcastCarrierConfigs();



        assertEquals("connected_mmwave", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());



        // should trigger 10 second primary timer
@@ -676,7 +723,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        processAllMessages();



        assertEquals("connected", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertTrue(mNetworkTypeController.is5GHysteresisActive());
@@ -686,7 +733,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


        // should trigger 30 second secondary timer

        assertEquals("connected", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertTrue(mNetworkTypeController.is5GHysteresisActive());
@@ -700,7 +747,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 


        // timer should not have gone off

        assertEquals("connected_mmwave", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertFalse(mNetworkTypeController.is5GHysteresisActive());

    }
@@ -717,7 +764,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        broadcastCarrierConfigs();



        assertEquals("connected_mmwave", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());



        // should trigger 10 second primary timer
@@ -726,7 +773,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        processAllMessages();



        assertEquals("connected", getCurrentState().getName());

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED,

                mNetworkTypeController.getOverrideNetworkType());

        assertTrue(mNetworkTypeController.is5GHysteresisActive());

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

+2 −2
Original line number Diff line number Diff line
@@ -2009,7 +2009,7 @@ public class DcTrackerTest extends TelephonyTest { 


        // NetCapability should switch to unmetered with fr=MMWAVE

        doReturn(new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_LTE,

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE))

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED))

                .when(mDisplayInfoController).getTelephonyDisplayInfo();

        mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_TELEPHONY_DISPLAY_INFO_CHANGED));

        waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());
@@ -2046,7 +2046,7 @@ public class DcTrackerTest extends TelephonyTest { 


        // NetCapability should switch to unmetered when fr=MMWAVE and MMWAVE unmetered

        doReturn(new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_LTE,

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE))

                TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED))

                .when(mDisplayInfoController).getTelephonyDisplayInfo();

        mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_TELEPHONY_DISPLAY_INFO_CHANGED));

        waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());