Remove volte_feature_disabled as carrier config handled it.
Junda Liu [Wed, 22 Jul 2015 19:23:46 +0000 (12:23 -0700)]
Bug: b/22602876
Change-Id: I8941162f6ece7ffa840401b7b55a3cd770c3b959

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

index f8f2bf6..bee8306 100644 (file)
@@ -232,15 +232,10 @@ public class ImsManager {
             return true;
         }
 
-        boolean disabledByGlobalSetting = android.provider.Settings.Global.getInt(
-                context.getContentResolver(),
-                android.provider.Settings.Global.VOLTE_FEATURE_DISABLED, 0) == 1;
-
         return context.getResources().getBoolean(
                 com.android.internal.R.bool.config_device_volte_available)
                 && getBooleanCarrierConfig(context,
-                        CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL)
-                && !disabledByGlobalSetting;
+                        CarrierConfigManager.KEY_CARRIER_VOLTE_AVAILABLE_BOOL);
     }
 
     /*