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

Commit 8ece0f63 authored by SongFerngWang's avatar SongFerngWang
Browse files

Fix race condition problem for the nr state. 

When FW handle the service state and physical channel config at the same
time and if physical channel config event is received before pollstatedone()
is called, old information from mSS can be used and this can cause notifying
unexpected status.. It is possible that the nr state is wrong.

Bug: 179622616
Test: Build pass.
atest frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

Change-Id: Ie300463858c690efd81b3cf775c76809c534d29a
parent 155a9824

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

+6 −16
Original line number Diff line number Diff line
@@ -2374,7 +2374,6 @@ public class ServiceStateTracker extends Handler { 
                int serviceState = regCodeToServiceState(registrationState);

                int newDataRat = ServiceState.networkTypeToRilRadioTechnology(

                        networkRegState.getAccessNetworkTechnology());

                boolean nrHasChanged = false;



                if (DBG) {

                    log("handlePollStateResultMessage: PS cellular. " + networkRegState);
@@ -2386,21 +2385,8 @@ public class ServiceStateTracker extends Handler { 
                if (serviceState == ServiceState.STATE_OUT_OF_SERVICE) {

                    mLastPhysicalChannelConfigList = null;

                }

                nrHasChanged |= updateNrFrequencyRangeFromPhysicalChannelConfigs(

                        mLastPhysicalChannelConfigList, mNewSS);

                nrHasChanged |= updateNrStateFromPhysicalChannelConfigs(

                        mLastPhysicalChannelConfigList, mNewSS);

                setPhyCellInfoFromCellIdentity(mNewSS, networkRegState.getCellIdentity());



                if (nrHasChanged) {

                    TelephonyMetrics.getInstance().writeServiceStateChanged(

                            mPhone.getPhoneId(), mSS);

                    mPhone.getVoiceCallSessionStats().onServiceStateChanged(mSS);

                    mServiceStateStats.onServiceStateChanged(mSS);

                }



                if (mPhone.isPhoneTypeGsm()) {



                    mNewReasonDataDenied = networkRegState.getRejectCause();

                    mNewMaxDataCalls = dataSpecificStates.maxDataCalls;

                    mGsmDataRoaming = regCodeIsRoaming(registrationState);
@@ -3505,6 +3491,12 @@ public class ServiceStateTracker extends Handler { 
            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) {

            log("Poll ServiceState done: "

                    + " oldSS=[" + mSS + "] newSS=[" + mNewSS + "]"
@@ -3836,9 +3828,7 @@ public class ServiceStateTracker extends Handler { 
            mPhone.getContext().getContentResolver()

                    .insert(getUriForSubscriptionId(mPhone.getSubId()),

                            getContentValuesForServiceState(mSS));

        }



        if (hasChanged || hasNrStateChanged) {

            TelephonyMetrics.getInstance().writeServiceStateChanged(mPhone.getPhoneId(), mSS);

            mPhone.getVoiceCallSessionStats().onServiceStateChanged(mSS);

            mServiceStateStats.onServiceStateChanged(mSS);