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

Commit 087c4703 authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Fixed the mismatched protocol anomaly detector" into tm-qpr-dev

parents 707acc55 432f8c90

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

+2 −1
Original line number Diff line number Diff line
@@ -2454,7 +2454,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