1 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index f8446f8..f4d143d 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -190,6 +190,12 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
             mValidListener = true;
         }
 
+        if (!isWfcModeSupported()) {
+            android.provider.Settings.Global.putInt(context.getContentResolver(),
+                    android.provider.Settings.Global.WFC_IMS_MODE,
+                    ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY);
+        }
+
         // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
         boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)
                 && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
@@ -247,7 +253,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         mButtonWfcMode.setEnabled(wfcEnabled);
 
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        if (wfcEnabled) {
+        if (wfcEnabled && isWfcModeSupported()) {
             preferenceScreen.addPreference(mButtonWfcMode);
         } else {
             preferenceScreen.removePreference(mButtonWfcMode);
@@ -290,4 +296,9 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         }
         return resId;
     }
+
+    private boolean isWfcModeSupported() {
+        return getActivity().getResources().getBoolean(
+                R.bool.config_wfc_mode_supported);
+    }
 }