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

Commit 35664345 authored by Jared Tsai's avatar Jared Tsai
Browse files

Using overrideServiceState after applying PhysicalChannelConfigList 

The testing service state from ACTION_TEST_SERVICE_STATE broadcast
cannot be applied on 5G network because the NR State and NR Frequency
Range will be reset by PhysicalChannelConfigList.

Solution:
Override service state after being updated by physical channel configs

Change-Id: I14c1356579d1cd9d3bc82e0711f89ffe58d1eed0
parent ed8efea5

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

+3 −2
Original line number Diff line number Diff line
@@ -3437,14 +3437,15 @@ public class ServiceStateTracker extends Handler { 
        useDataRegStateForDataOnlyDevices();

        processIwlanRegistrationInfo();



        updateNrFrequencyRangeFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);

        updateNrStateFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);



        if (TelephonyUtils.IS_DEBUGGABLE && mPhone.mTelephonyTester != null) {

            mPhone.mTelephonyTester.overrideServiceState(mNewSS);

        }



        NetworkRegistrationInfo networkRegState = mNewSS.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        updateNrFrequencyRangeFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);

        updateNrStateFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);

        setPhyCellInfoFromCellIdentity(mNewSS, networkRegState.getCellIdentity());



        if (DBG) {