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

Commit b124087a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Using overrideServiceState after applying PhysicalChannelConfigList" am: 21afa37b 

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



Change-Id: If7577f71c4a4f959b1c567f6322bb53fb7de36d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74ae92ce 21afa37b

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

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

        useDataRegStateForDataOnlyDevices();

        processIwlanRegistrationInfo();

        processIwlanRegistrationInfo();





        updateNrFrequencyRangeFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);

        updateNrStateFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);



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

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

            mPhone.mTelephonyTester.overrideServiceState(mNewSS);

            mPhone.mTelephonyTester.overrideServiceState(mNewSS);

        }

        }





        NetworkRegistrationInfo networkRegState = mNewSS.getNetworkRegistrationInfo(

        NetworkRegistrationInfo networkRegState = mNewSS.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);

        updateNrFrequencyRangeFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);

        updateNrStateFromPhysicalChannelConfigs(mLastPhysicalChannelConfigList, mNewSS);

        setPhyCellInfoFromCellIdentity(mNewSS, networkRegState.getCellIdentity());

        setPhyCellInfoFromCellIdentity(mNewSS, networkRegState.getCellIdentity());





        if (DBG) {

        if (DBG) {