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

Commit 66f94a89 authored by SongFerngWang's avatar SongFerngWang
Browse files

Add two cases for device resets NR timer 

1. If carrier config
KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL is true,
then device reset all of NR timers
when device camped on a network that haven't 5G capability and
RRC currently in IDLE state.
2. Device reset all of NR timers when device is in 3G or 2G.

Bug: 160365713
Bug: 160298986
Test: atest NetworkTypeControllerTest (PASS)
Change-Id: Iaaa3d21b36a56a63a5340173db0462e1fdf4e240
Merged-In: Iaaa3d21b36a56a63a5340173db0462e1fdf4e240
parent 3bbc72c2

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

+27 −0
Original line number Original line Diff line number Diff line
@@ -146,6 +146,7 @@ public class NetworkTypeController extends StateMachine { 
    private boolean mIsPhysicalChannelConfigOn;

    private boolean mIsPhysicalChannelConfigOn;

    private boolean mIsPrimaryTimerActive;

    private boolean mIsPrimaryTimerActive;

    private boolean mIsSecondaryTimerActive;

    private boolean mIsSecondaryTimerActive;

    private boolean mIsTimerResetEnabledForLegacyStateRRCIdle;

    private String mPrimaryTimerState;

    private String mPrimaryTimerState;

    private String mSecondaryTimerState;

    private String mSecondaryTimerState;

    private String mPreviousState;

    private String mPreviousState;
@@ -230,6 +231,9 @@ public class NetworkTypeController extends StateMachine { 
                CarrierConfigManager.KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING);

                CarrierConfigManager.KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING);

        mLteEnhancedPattern = CarrierConfigManager.getDefaultConfig().getString(

        mLteEnhancedPattern = CarrierConfigManager.getDefaultConfig().getString(

                CarrierConfigManager.KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING);

                CarrierConfigManager.KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING);

        mIsTimerResetEnabledForLegacyStateRRCIdle =

                CarrierConfigManager.getDefaultConfig().getBoolean(

                        CarrierConfigManager.KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL);





        CarrierConfigManager configManager = (CarrierConfigManager) mPhone.getContext()

        CarrierConfigManager configManager = (CarrierConfigManager) mPhone.getContext()

                .getSystemService(Context.CARRIER_CONFIG_SERVICE);

                .getSystemService(Context.CARRIER_CONFIG_SERVICE);
@@ -255,6 +259,8 @@ public class NetworkTypeController extends StateMachine { 
                    mLteEnhancedPattern = b.getString(

                    mLteEnhancedPattern = b.getString(

                            CarrierConfigManager.KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING);

                            CarrierConfigManager.KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING);

                }

                }

                mIsTimerResetEnabledForLegacyStateRRCIdle = b.getBoolean(

                        CarrierConfigManager.KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL);

            }

            }

        }

        }

        createTimerRules(nrIconConfiguration, overrideTimerRule, overrideSecondaryTimerRule);

        createTimerRules(nrIconConfiguration, overrideTimerRule, overrideSecondaryTimerRule);
@@ -553,6 +559,10 @@ public class NetworkTypeController extends StateMachine { 
                    } else if (isLte(rat) && isNrNotRestricted()) {

                    } else if (isLte(rat) && isNrNotRestricted()) {

                        transitionWithTimerTo(isDataActive() ? mLteConnectedState : mIdleState);

                        transitionWithTimerTo(isDataActive() ? mLteConnectedState : mIdleState);

                    } else {

                    } else {

                        if (!isLte(rat)) {

                            // Rat is 3G or 2G, and it doesn't need NR timer.

                            resetAllTimers();

                        }

                        updateOverrideNetworkType();

                        updateOverrideNetworkType();

                    }

                    }

                    mIsNrRestricted = isNrRestricted();

                    mIsNrRestricted = isNrRestricted();
@@ -571,6 +581,14 @@ public class NetworkTypeController extends StateMachine { 
                case EVENT_DATA_ACTIVITY_CHANGED:

                case EVENT_DATA_ACTIVITY_CHANGED:

                    // ignored

                    // ignored

                    break;

                    break;

                case EVENT_PHYSICAL_LINK_STATE_CHANGED:

                    AsyncResult ar = (AsyncResult) msg.obj;

                    mPhysicalLinkState = (int) ar.result;

                    if (mIsTimerResetEnabledForLegacyStateRRCIdle && !isPhysicalLinkActive()) {

                        resetAllTimers();

                        updateOverrideNetworkType();

                    }

                    break;

                default:

                default:

                    return NOT_HANDLED;

                    return NOT_HANDLED;

            }

            }
@@ -877,9 +895,18 @@ public class NetworkTypeController extends StateMachine { 
        if (currentState.equals(STATE_CONNECTED_MMWAVE)) {

        if (currentState.equals(STATE_CONNECTED_MMWAVE)) {

            resetAllTimers();

            resetAllTimers();

        }

        }



        int rat = mPhone.getServiceState().getDataNetworkType();

        if (!isLte(rat) && rat != TelephonyManager.NETWORK_TYPE_NR) {

            // Rat is 3G or 2G, and it doesn't need NR timer.

            resetAllTimers();

        }

    }

    }





    private void resetAllTimers() {

    private void resetAllTimers() {

        if (DBG) {

            log("Remove all timers");

        }

        removeMessages(EVENT_PRIMARY_TIMER_EXPIRED);

        removeMessages(EVENT_PRIMARY_TIMER_EXPIRED);

        removeMessages(EVENT_SECONDARY_TIMER_EXPIRED);

        removeMessages(EVENT_SECONDARY_TIMER_EXPIRED);

        mIsPrimaryTimerActive = false;

        mIsPrimaryTimerActive = false;

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

+43 −0
Original line number Original line Diff line number Diff line
@@ -373,6 +373,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testPrimaryTimerExpire() throws Exception {

    public void testPrimaryTimerExpire() throws Exception {

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");
@@ -402,6 +403,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testPrimaryTimerReset() throws Exception {

    public void testPrimaryTimerReset() throws Exception {

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");
@@ -436,6 +438,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testPrimaryTimerExpireMmwave() throws Exception {

    public void testPrimaryTimerExpireMmwave() throws Exception {

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

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

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,
@@ -467,6 +470,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testPrimaryTimerResetMmwave() throws Exception {

    public void testPrimaryTimerResetMmwave() throws Exception {

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

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

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,
@@ -502,6 +506,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testSecondaryTimerExpire() throws Exception {

    public void testSecondaryTimerExpire() throws Exception {

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");
@@ -542,6 +547,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testSecondaryTimerReset() throws Exception {

    public void testSecondaryTimerReset() throws Exception {

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");
@@ -587,6 +593,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testSecondaryTimerExpireMmwave() throws Exception {

    public void testSecondaryTimerExpireMmwave() throws Exception {

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

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

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,
@@ -628,6 +635,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 




    @Test

    @Test

    public void testSecondaryTimerResetMmwave() throws Exception {

    public void testSecondaryTimerResetMmwave() throws Exception {

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

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

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,
@@ -671,4 +679,39 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

                mNetworkTypeController.getOverrideNetworkType());

                mNetworkTypeController.getOverrideNetworkType());

    }

    }



    @Test

    public void testNrTimerResetIn3g() throws Exception {

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

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

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

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING,

                "connected_mmwave,any,10;connected,any,10;not_restricted_rrc_con,any,10");

        mBundle.putString(CarrierConfigManager.KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING,

                "connected_mmwave,any,30");

        broadcastCarrierConfigs();



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

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

                mNetworkTypeController.getOverrideNetworkType());



        // should trigger 10 second primary timer

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

        mNetworkTypeController.sendMessage(EVENT_NR_FREQUENCY_CHANGED);

        processAllMessages();



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

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE,

                mNetworkTypeController.getOverrideNetworkType());



        // rat is UMTS, should stop timer

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

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

        mNetworkTypeController.sendMessage(EVENT_DATA_RAT_CHANGED);

        processAllMessages();



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

        assertEquals(TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE,

                mNetworkTypeController.getOverrideNetworkType());

    }

}
 
}