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

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

Merge "Using overrideServiceState after applying PhysicalChannelConfigList"... 

Merge "Using overrideServiceState after applying PhysicalChannelConfigList" am: 21afa37b am: b124087a am: b76250d9 am: 90795bc8

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



Change-Id: If44c3729e3f50afc757d6fd234ff5e2fb58ecf66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c985d92a 90795bc8

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

+3 −2
Original line number Diff line number Diff line
@@ -3455,14 +3455,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) {