commit e08cc1e56f83c5f4bc753cda34decf4f8aa71893
author Tyler Gunn <tgunn@google.com> Fri Dec 04 21:24:52 2015 -0800
committer Tyler Gunn <tgunn@google.com> Fri Dec 04 21:24:52 2015 -0800
tree 3788d1ab2fc39fc625e472cbaaf89116a3034102
parent fdd69de7a5d886baa4310a6792858722a8f18f16

Revert "Revert "Merge commit 'b6548a9' into merge""

This reverts commit 692b80a067c49519afdf51df9127ebe477c50a68.

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 895c685..2f835fe 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -83,8 +83,6 @@
         implements Preference.OnPreferenceChangeListener {
     private static final String LOG_TAG = "CallFeaturesSetting";
     private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
-    // STOPSHIP if true. Flag to override behavior default behavior to hide VT setting.
-    private static final boolean ENABLE_VT_FLAG = true;
 
     // String keys for preference lookup
     // TODO: Naming these "BUTTON_*" is confusing since they're not actually buttons(!)
@@ -264,7 +262,7 @@
             }
         }
 
-        if (ImsManager.isVtEnabledByPlatform(mPhone.getContext()) && ENABLE_VT_FLAG) {
+        if (ImsManager.isVtEnabledByPlatform(mPhone.getContext())) {
             boolean currentValue =
                     ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mPhone.getContext())
                     ? PhoneGlobals.getInstance().phoneMgr.isVideoCallingEnabled(