commit 087c47037ccc44137a0f81202d7a891c4d3e02b0
author Ling Ma <linggm@google.com> Fri Jan 13 21:18:06 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 13 21:18:06 2023 +0000
tree 9357518c2cab9c41f91f6ee2cb82ceab78afafa1
parent 707acc550b84f14800b5387be02b29265bc80b5b
parent 432f8c905c9e08b0bf2587a1957d2fc7314f773e

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

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

diff --git a/src/java/com/android/internal/telephony/data/DataNetwork.java b/src/java/com/android/internal/telephony/data/DataNetwork.java
index e6d0be7..8572891 100644
--- a/src/java/com/android/internal/telephony/data/DataNetwork.java
+++ b/src/java/com/android/internal/telephony/data/DataNetwork.java
@@ -2454,7 +2454,8 @@
             }
             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