commit f86fb84367efc94ff006c1b10b48d4eabdcd1346
author Jack Yu <jackyu@google.com> Sun Jul 31 00:43:21 2022 -0700
committer Jack Yu <jackyu@google.com> Sun Jul 31 00:45:26 2022 -0700
tree 43ee1e510f59a7d5ece7e5d0c1498952d335e4bd
parent ac0db879490e96bedacdd6268c5f3249d9d2ba85

Removed old data stack

Fix: 201830726
Test: Manual
Change-Id: I798b17a59c0288b0ceccd8115631c2c87e8e0aeb

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 7bff98a..fdd610e 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -456,11 +456,7 @@
                     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();
-        }
+        isDataEnabled = mPhone.getDataSettingsManager().isDataEnabled();
         if (mImsMgr.isVtEnabledByPlatform() && mImsMgr.isVtProvisionedOnDevice()
                 && (carrierConfig.getBoolean(
                         CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)