aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-14 02:28:05 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-14 02:28:05 +0000
commitb9822af3d7bff431ec187b5d2f2d57929f29184a (patch)
tree9357518c2cab9c41f91f6ee2cb82ceab78afafa1
parenta4b2753be77f9532c3d95d2e4fe2077d46249078 (diff)
parent087c47037ccc44137a0f81202d7a891c4d3e02b0 (diff)
downloadtelephony-b9822af3d7bff431ec187b5d2f2d57929f29184a.tar.gz
Snap for 9490108 from 087c47037ccc44137a0f81202d7a891c4d3e02b0 to tm-qpr3-release
Change-Id: Iaddf30740e6ace0298a05a9c06420c2c93715760
-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