commit b77d6bac9fc61d7af40e384e5c20a44e9fc45a69
author Jack Yu <jackyu@google.com> Wed Nov 30 17:23:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 30 17:23:06 2016 +0000
tree 1992820aa0ec25e7794b65a6d38658d2a4885703
parent efda70d23c9c629f64b766a768049af3dd3e527d
parent b7628321f4a83c6ecbff55b491b1664b2c0822d4

Added configuration for VT downgrade/tear down when data disabled
am: b7628321f4

Change-Id: I735d40ade87858320213501eaa750399c159428e

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 111e263..b5e8026 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -284,7 +284,9 @@
 
         if (ImsManager.isVtEnabledByPlatform(mPhone.getContext()) &&
                 ImsManager.isVtProvisionedOnDevice(mPhone.getContext()) &&
-                mPhone.mDcTracker.isDataEnabled(true)) {
+                (carrierConfig.getBoolean(
+                        CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
+                        || mPhone.mDcTracker.isDataEnabled(true))) {
             boolean currentValue =
                     ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mPhone.getContext())
                     ? PhoneGlobals.getInstance().phoneMgr.isVideoCallingEnabled(