Revert "Merge commit '6f3737f' into merge"
Etan Cohen [Fri, 22 May 2015 05:09:09 +0000 (05:09 +0000)]
This reverts commit 5f4406f0bb8bab1fcd33b52a08fb79ed8ba7a742.

Change-Id: I85afceb67112a772cedf4a902714d28c81900312

src/java/com/android/ims/ImsManager.java

index 12a0f1f..6183828 100644 (file)
@@ -286,49 +286,6 @@ public class ImsManager {
     }
 
     /**
-     * Returns the user configuration of VT setting
-     */
-    public static boolean isVtEnabledByUser(Context context) {
-        int enabled = android.provider.Settings.Global.getInt(context.getContentResolver(),
-                android.provider.Settings.Global.VT_IMS_ENABLED,
-                ImsConfig.FeatureValueConstants.ON);
-        return (enabled == 1) ? true : false;
-    }
-
-    /**
-     * Change persistent VT enabled setting
-     */
-    public static void setVtSetting(Context context, boolean enabled) {
-        int value = enabled ? 1 : 0;
-        android.provider.Settings.Global.putInt(context.getContentResolver(),
-                android.provider.Settings.Global.VT_IMS_ENABLED, value);
-
-        ImsManager imsManager = ImsManager.getInstance(context,
-                SubscriptionManager.getDefaultVoicePhoneId());
-        if (imsManager != null) {
-            try {
-                ImsConfig config = imsManager.getConfigInterface();
-                config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE,
-                        TelephonyManager.NETWORK_TYPE_LTE,
-                        enabled ? ImsConfig.FeatureValueConstants.ON
-                                : ImsConfig.FeatureValueConstants.OFF, null);
-
-                if (enabled) {
-                    imsManager.turnOnIms();
-                } else if (context.getResources().getBoolean(
-                        com.android.internal.R.bool.imsServiceAllowTurnOff) && (
-                        !isVolteEnabledByPlatform(context)
-                        || !isEnhanced4gLteModeSettingEnabledByUser(context))) {
-                    log("setVtSetting() : imsServiceAllowTurnOff -> turnOffIms");
-                    imsManager.turnOffIms();
-                }
-            } catch (ImsException e) {
-                loge("setVtSetting(): " + e);
-            }
-        }
-    }
-
-    /**
      * Returns the user configuration of WFC setting
      */
     public static boolean isWfcEnabledByUser(Context context) {