commit 99e873351e58c4472c78aba0b97beda8756b816b
author Jack Yu <jackyu@google.com> Fri Dec 17 23:14:15 2021 -0800
committer Sarah Chin <sarahchin@google.com> Mon Dec 20 18:12:35 2021 -0800
tree b28043da9c9cb438940ddfc75b782ea039b44547
parent 45de5c9d12166b3da4fc102ead9f8aace1134462

Hook DataSettingsManager to the new telephony data stack

Use DataSettingsManager instead of DataEnabledSettings if
running new data stack is enabled.

Test: Manual
Bug: 204309297
Change-Id: I3b9f712fe23919ab6fb5a2c5b92dac64589fe4a6

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index d249fae..e64c81c 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -455,10 +455,16 @@
         boolean useWfcHomeModeForRoaming = carrierConfig.getBoolean(
                     CarrierConfigManager.KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL,
                     false);
+        boolean isDataEnabled;
+        if (mPhone.isUsingNewDataStack()) {
+            isDataEnabled = mPhone.getDataSettingsManager().isDataEnabled();
+        } else {
+            isDataEnabled = mPhone.getDataEnabledSettings().isDataEnabled();
+        }
         if (mImsMgr.isVtEnabledByPlatform() && mImsMgr.isVtProvisionedOnDevice()
                 && (carrierConfig.getBoolean(
                         CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
-                || mPhone.getDataEnabledSettings().isDataEnabled())) {
+                || isDataEnabled)) {
             boolean currentValue =
                     mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()
                     ? mImsMgr.isVtEnabledByUser() : false;