commit 3fb3a6bb0ed5f67f010d7418196bcf32d7ef8613
author Jack Yu <jackyu@google.com> Fri Dec 03 14:23:53 2021 -0800
committer Jack Yu <jackyu@google.com> Thu Mar 03 23:16:23 2022 -0800
tree a82c99a43a055478500d39bcfdde973c6ba21f25
parent f469ab4961ac05f156ba757c0ad6f31f21cfabd5

Added more conditions for setup and tear down.

1. Added more conditions that can trigger re-evaluate
   unsatisfied network requests, and re-evaluate existing data
   networks.
2. Support lingering network types to allow IMS lingering on
   3G networks.

Bug: 196597630
Test: Manual & atest FrameworksTelephonyTests
Merged-In: I8f718d0af11b36c4a172a580de6a249b18aa73c8
Change-Id: I8f718d0af11b36c4a172a580de6a249b18aa73c8

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f9cc52e..37d71df 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6602,11 +6602,16 @@
         final long identity = Binder.clearCallingIdentity();
         try {
             int phoneId = mSubscriptionController.getPhoneId(subId);
-            if (DBG) log("isDataEnabled: subId=" + subId + " phoneId=" + phoneId);
             Phone phone = PhoneFactory.getPhone(phoneId);
             if (phone != null) {
-                boolean retVal = phone.getDataEnabledSettings().isDataEnabled();
-                if (DBG) log("isDataEnabled: subId=" + subId + " retVal=" + retVal);
+                boolean retVal;
+                if (phone.isUsingNewDataStack()) {
+                    retVal = phone.getDataNetworkController().getDataSettingsManager()
+                            .isDataEnabled();
+                } else {
+                    retVal = phone.getDataEnabledSettings().isDataEnabled();
+                }
+                if (DBG) log("isDataEnabled: " + retVal + ", subId=" + subId);
                 return retVal;
             } else {
                 if (DBG) loge("isDataEnabled: no phone subId=" + subId + " retVal=false");