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

Commit bff92350 authored by Ling Ma's avatar Ling Ma Committed by Automerger Merge Worker
Browse files

Merge "Fixed the mismatched protocol anomaly detector" into tm-qpr-dev am: 087c4703 

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



Change-Id: I8f8d3bb832a712094220746df28c691b1b2b67dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56b6f24e 087c4703

src/java/com/android/internal/telephony/data/DataNetwork.java

+2 −1
Original line number Diff line number Diff line
@@ -2464,7 +2464,8 @@ public class DataNetwork extends StateMachine { 
            }

            NetworkRegistrationInfo nri = getNetworkRegistrationInfo();

            if (mDataProfile.getApnSetting() != null && nri != null && nri.isInService()) {

                boolean isRoaming = mPhone.getServiceState().getDataRoamingFromRegistration();

                boolean isRoaming = nri.getInitialRegistrationState()

                        == NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING;

                int protocol = isRoaming ? mDataProfile.getApnSetting().getRoamingProtocol()

                        : mDataProfile.getApnSetting().getProtocol();

                String underlyingDataService = mTransport