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

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

Merge "Framework doesn't send DataRatChanged when LteAdvancedPro Changed" am: 87a70c96 

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

Change-Id: I31d4b4bee705459994c1c33e12f76bfae120563b
parents c7c5adc0 87a70c96

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

+9 −1
Original line number Diff line number Diff line
@@ -3205,6 +3205,10 @@ public class ServiceStateTracker extends Handler { 
                mTransportManager.getAvailableTransports().length);

        boolean anyDataRegChanged = false;

        boolean anyDataRatChanged = false;

        boolean hasAlphaRawChanged =

                mSS.getOperatorAlphaLongRaw() != mNewSS.getOperatorAlphaLongRaw()

                        || mSS.getOperatorAlphaShortRaw() != mNewSS.getOperatorAlphaShortRaw();



        for (int transport : mTransportManager.getAvailableTransports()) {

            NetworkRegistrationInfo oldNrs = mSS.getNetworkRegistrationInfo(

                    NetworkRegistrationInfo.DOMAIN_PS, transport);
@@ -3234,7 +3238,10 @@ public class ServiceStateTracker extends Handler { 
            boolean isNewCA = newNrs!= null ? (newNrs. getDataSpecificInfo() != null

                    ? newNrs. getDataSpecificInfo().isUsingCarrierAggregation() : false) : false;



            hasRilDataRadioTechnologyChanged.put(transport, oldRAT != newRAT || isOldCA != isNewCA);

            // If the carrier enable KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING and the operator name

            // match this pattern, the data rat display LteAdvanced indicator.

            hasRilDataRadioTechnologyChanged.put(transport,

                    oldRAT != newRAT || isOldCA != isNewCA || hasAlphaRawChanged);

            if (oldRAT != newRAT) {

                anyDataRatChanged = true;

            }
@@ -5635,6 +5642,7 @@ public class ServiceStateTracker extends Handler { 
            if (networkRegistrationInfos.get(i) != null) {

                updateOperatorNameForCellIdentity(

                        networkRegistrationInfos.get(i).getCellIdentity());

                servicestate.addNetworkRegistrationInfo(networkRegistrationInfos.get(i));

            }

        }

    }