diff options
| author | Junda Liu <junda@google.com> | 2015-07-22 12:23:46 -0700 |
|---|---|---|
| committer | Junda Liu <junda@google.com> | 2015-07-22 12:23:46 -0700 |
| commit | 7e16d5de947db5fb27c25b5a659f1a5233a52857 (patch) | |
| tree | 8d5a66198ac5533752c3db02e511a4b73e9ec9cb | |
| parent | e7663c09acfdfa34d423be3c1ac7fecf2eb5e3e1 (diff) | |
| download | ims-7e16d5de947db5fb27c25b5a659f1a5233a52857.tar.gz | |
Remove volte_feature_disabled as carrier config handled it.
Bug: b/22602876
Change-Id: I8941162f6ece7ffa840401b7b55a3cd770c3b959
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index f8f2bf6f..bee8306b 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -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); } /* |