commit ae264ca16f1ff104f4f88d7db25234bac81284aa
author Jack Yu <jackyu@google.com> Fri Mar 04 07:46:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 04 07:46:11 2022 +0000
tree 6ccb69397d8f60722ad24a84812798408771ca2b
parent a9907912f66f936ac6db5d7c091ee9a9051370c9
parent f158fd0b0f94b42e3adc1d3f84a6229ef9c08b52

Merge "Added several changes in data stack" am: f469ab4961 am: f158fd0b0f

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2007850

Change-Id: I4c87d866ca567c716da55661a619906d5bcb29f1

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 722d436..ba8619a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2939,6 +2939,9 @@
         try {
             final Phone phone = getPhone(subId);
             if (phone != null) {
+                if (phone.isUsingNewDataStack()) {
+                    return phone.getDataNetworkController().getInternetDataNetworkState();
+                }
                 return PhoneConstantConversions.convertDataState(phone.getDataConnectionState());
             } else {
                 return PhoneConstantConversions.convertDataState(