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

Commit 4bfe2f54 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Framework doesn't send DataRatChanged when LteAdvancedPro Changed" into... 

Merge "Framework doesn't send DataRatChanged when LteAdvancedPro Changed" into rvc-dev am: 1fdfa936

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

Change-Id: I4b51b87cf5f9930c45f76a3cc22f43c305f314e5
parents 65b92947 1fdfa936

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

+9 −1
Original line number Diff line number Diff line
@@ -3204,6 +3204,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);
@@ -3233,7 +3237,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;

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

                updateOperatorNameForCellIdentity(

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

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

            }

        }

    }