aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLing Ma <linggm@google.com>2023-01-13 21:18:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-01-13 21:18:06 +0000
commit087c47037ccc44137a0f81202d7a891c4d3e02b0 (patch)
tree9357518c2cab9c41f91f6ee2cb82ceab78afafa1
parent707acc550b84f14800b5387be02b29265bc80b5b (diff)
parent432f8c905c9e08b0bf2587a1957d2fc7314f773e (diff)
downloadtelephony-087c47037ccc44137a0f81202d7a891c4d3e02b0.tar.gz
Merge "Fixed the mismatched protocol anomaly detector" into tm-qpr-dev
-rw-r--r--src/java/com/android/internal/telephony/data/DataNetwork.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/data/DataNetwork.java b/src/java/com/android/internal/telephony/data/DataNetwork.java
index e6d0be7212..85728918f5 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 @@ 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