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

Commit abe59cab authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Fix remembering last known cell identity for data-only devices" into main

parents 7896552b 66fba601

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

+5 −1
Original line number Diff line number Diff line
@@ -3802,7 +3802,11 @@ public class ServiceStateTracker extends Handler { 
        mNewSS.setOutOfService(false);



        mCellIdentity = primaryCellIdentity;

        if (mSS.getState() == ServiceState.STATE_IN_SERVICE && primaryCellIdentity != null) {

        boolean isCsRegistered = mSS.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_CS,

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN).isNetworkRegistered();

        boolean isPsRegistered = mSS.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,

                AccessNetworkConstants.TRANSPORT_TYPE_WWAN).isNetworkRegistered();

        if (isCsRegistered || isPsRegistered) {

            mLastKnownCellIdentity = mCellIdentity;

            removeMessages(EVENT_RESET_LAST_KNOWN_CELL_IDENTITY);

        }