diff options
| author | Junda Liu <junda@google.com> | 2015-07-23 19:17:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:17:37 +0000 |
| commit | 245869b403c10a26dee0632b7b1154652b4aa163 (patch) | |
| tree | 4944f55715e858b9c43a50b5eb0a20e55684651d /src/java/com/android/ims/ImsManager.java | |
| parent | 102b0ede9371abb333c0a644c026dc667b51b3db (diff) | |
| parent | eb9a8ab415c8c9c0bf54104b2b6f858e83802ba2 (diff) | |
| download | ims-245869b403c10a26dee0632b7b1154652b4aa163.tar.gz | |
am eb9a8ab4: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev
* commit 'eb9a8ab415c8c9c0bf54104b2b6f858e83802ba2':
Remove volte_feature_disabled as carrier config handled it.
Diffstat (limited to 'src/java/com/android/ims/ImsManager.java')
| -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 f12a6bcf..3122b9ef 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -245,15 +245,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); } /* |