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

Commit 9e9476e2 authored by Sooraj Sasindran's avatar Sooraj Sasindran
Browse files

Use tac and ci as lac and cid for LTE 

In case of LTE, use ci and tac as cid and lac.
Convert ril registration state to ServiceState
registration state.

Test: verified unit tests.
      verified on device that device reports
      registration correctly
Bug=32223344
Change-Id: I556914dc17dae3842048fc574e5554ef26264720
parent a8b56a37

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

+45 −17
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.res.Resources; 
import android.database.ContentObserver;

import android.hardware.radio.V1_0.CellInfoType;

import android.hardware.radio.V1_0.DataRegStateResult;

import android.hardware.radio.V1_0.RegState;

import android.hardware.radio.V1_0.VoiceRegStateResult;

import android.os.AsyncResult;

import android.os.BaseBundle;
@@ -910,6 +911,17 @@ public class ServiceStateTracker extends Handler { 
                    }

                    break;

                }

                case CellInfoType.LTE: {

                    if (voiceRegStateResult.cellIdentity.cellIdentityLte.size() == 1) {

                        android.hardware.radio.V1_0.CellIdentityLte cellIdentityLte =

                                voiceRegStateResult.cellIdentity.cellIdentityLte.get(0);

                        cid = cellIdentityLte.ci;



                        /* Continuing the historical behaviour of using tac as lac. */

                        lac = cellIdentityLte.tac;

                    }

                    break;

                }

                default: {

                    break;

                }
@@ -1652,12 +1664,39 @@ public class ServiceStateTracker extends Handler { 
        return cdmaRoaming && !isSameOperatorNameFromSimAndSS(s);

    }



    private int getRegStateFromHalRegState(int regState) {

        switch (regState) {

            case RegState.NOT_REG_MT_NOT_SEARCHING_OP:

                return ServiceState.RIL_REG_STATE_NOT_REG;

            case RegState.REG_HOME:

                return ServiceState.RIL_REG_STATE_HOME;

            case RegState.NOT_REG_MT_SEARCHING_OP:

                return ServiceState.RIL_REG_STATE_SEARCHING;

            case RegState.REG_DENIED:

                return ServiceState.RIL_REG_STATE_DENIED;

            case RegState.UNKNOWN:

                return ServiceState.RIL_REG_STATE_UNKNOWN;

            case RegState.REG_ROAMING:

                return ServiceState.RIL_REG_STATE_ROAMING;

            case RegState.NOT_REG_MT_NOT_SEARCHING_OP_EM:

                return ServiceState.RIL_REG_STATE_NOT_REG_EMERGENCY_CALL_ENABLED;

            case RegState.NOT_REG_MT_SEARCHING_OP_EM:

                return ServiceState.RIL_REG_STATE_SEARCHING_EMERGENCY_CALL_ENABLED;

            case RegState.REG_DENIED_EM:

                return ServiceState.RIL_REG_STATE_DENIED_EMERGENCY_CALL_ENABLED;

            case RegState.UNKNOWN_EM:

                return ServiceState.RIL_REG_STATE_UNKNOWN_EMERGENCY_CALL_ENABLED;

            default:

                return ServiceState.REGISTRATION_STATE_NOT_REGISTERED_AND_NOT_SEARCHING;

        }

    }



    void handlePollStateResultMessage(int what, AsyncResult ar) {

        int ints[];

        switch (what) {

            case EVENT_POLL_STATE_REGISTRATION: {

                VoiceRegStateResult voiceRegStateResult = (VoiceRegStateResult) ar.result;

                int registrationState = voiceRegStateResult.regState;

                int registrationState = getRegStateFromHalRegState(voiceRegStateResult.regState);



                mNewSS.setVoiceRegState(regCodeToServiceState(registrationState));

                mNewSS.setRilVoiceRadioTechnology(voiceRegStateResult.rat);
@@ -1743,7 +1782,7 @@ public class ServiceStateTracker extends Handler { 


            case EVENT_POLL_STATE_GPRS: {

                DataRegStateResult dataRegStateResult = (DataRegStateResult) ar.result;

                int regState = dataRegStateResult.regState;

                int regState = getRegStateFromHalRegState(dataRegStateResult.regState);

                int dataRegState = regCodeToServiceState(regState);

                int newDataRat = dataRegStateResult.rat;
@@ -3054,25 +3093,14 @@ public class ServiceStateTracker extends Handler { 
        return guess;

    }



    /** code is registration state 0-5 from TS 27.007 7.2 */

    /** convert ServiceState registration code

     * to service state */

    private int regCodeToServiceState(int code) {

        switch (code) {

            case 0:

            case 2: // 2 is "searching"

            case 3: // 3 is "registration denied"

            case 4: // 4 is "unknown" no vaild in current baseband

            case 10:// same as 0, but indicates that emergency call is possible.

            case 12:// same as 2, but indicates that emergency call is possible.

            case 13:// same as 3, but indicates that emergency call is possible.

            case 14:// same as 4, but indicates that emergency call is possible.

                return ServiceState.STATE_OUT_OF_SERVICE;



            case 1:

            case 5: // 5 is "registered, roaming"

            case ServiceState.RIL_REG_STATE_HOME:

            case ServiceState.RIL_REG_STATE_ROAMING:

                return ServiceState.STATE_IN_SERVICE;



            default:

                loge("regCodeToServiceState: unexpected service state " + code);

                return ServiceState.STATE_OUT_OF_SERVICE;

        }

    }

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

+98 −0
Original line number Diff line number Diff line
@@ -608,6 +608,51 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        verify(mTestHandler, times(1)).sendMessageAtTime(any(Message.class), anyLong());

    }



    @Test

    @MediumTest

    public void testRegAndInvalidregForDataConnAttach() throws Exception {

        // Initially set service state out of service

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        mSimulatedCommands.setVoiceRegState(23);

        mSimulatedCommands.setDataRegState(23);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(100);



        sst.registerForDataConnectionAttached(mTestHandler, EVENT_DATA_CONNECTION_ATTACHED, null);



        // set service state in service and trigger events to post message on handler

        mSimulatedCommands.setVoiceRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(200);



        // verify if registered handler has message posted to it

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mTestHandler).sendMessageAtTime(messageArgumentCaptor.capture(), anyLong());

        assertEquals(EVENT_DATA_CONNECTION_ATTACHED, messageArgumentCaptor.getValue().what);



        // set service state out of service

        mSimulatedCommands.setVoiceRegState(-1);

        mSimulatedCommands.setDataRegState(-1);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(100);



        // Unregister registrant

        sst.unregisterForDataConnectionAttached(mTestHandler);



        // set service state in service

        mSimulatedCommands.setVoiceRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(100);



        // verify that no new message posted to handler

        verify(mTestHandler, times(1)).sendMessageAtTime(any(Message.class), anyLong());

    }

    @Test

    @MediumTest

    public void testRegAndUnregForDataConnAttach() throws Exception {
@@ -763,6 +808,59 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        verify(mTestHandler, times(1)).sendMessageAtTime(any(Message.class), anyLong());

    }



    @Test

    @MediumTest

    public void testRegAndInvalidRegForNetworkAttached() throws Exception {

        // Initially set service state out of service

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        mSimulatedCommands.setVoiceRegState(23);

        mSimulatedCommands.setDataRegState(23);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(100);



        sst.registerForNetworkAttached(mTestHandler, EVENT_REGISTERED_TO_NETWORK, null);



        // set service state in service and trigger events to post message on handler

        mSimulatedCommands.setVoiceRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(100);



        // verify if registered handler has message posted to it

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mTestHandler).sendMessageAtTime(messageArgumentCaptor.capture(), anyLong());

        assertEquals(EVENT_REGISTERED_TO_NETWORK, messageArgumentCaptor.getValue().what);



        // set service state out of service

        mSimulatedCommands.setVoiceRegState(-1);

        mSimulatedCommands.setDataRegState(-1);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(100);



        // Unregister registrant

        sst.unregisterForNetworkAttached(mTestHandler);





        waitForMs(100);



        sst.registerForNetworkAttached(mTestHandler, EVENT_REGISTERED_TO_NETWORK, null);



        // set service state in service

        mSimulatedCommands.setVoiceRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyNetworkStateChanged();



        waitForMs(100);



        // verify if registered handler has message posted to it

        messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);

        verify(mTestHandler).sendMessageAtTime(messageArgumentCaptor.capture(), anyLong());

        assertEquals(EVENT_REGISTERED_TO_NETWORK, messageArgumentCaptor.getValue().what);

    }



    @Test

    @MediumTest

    public void testRegisterForPsRestrictedEnabled() throws Exception {