diff --git a/res/values/array.xml b/res/values/array.xml
index 5a360f2..db62307 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -48,8 +48,8 @@
     <!-- android.telephony.TelephonyManager.WifiCallingChoices -->
     <string-array name="wifi_calling_choice_values">
         <item>@string/wifi_calling_choices_always_use</item>
-        <item>@string/wifi_calling_choices_never_use</item>
         <item>@string/wifi_calling_choices_ask_every_time</item>
+        <item>@string/wifi_calling_choices_never_use</item>
     </string-array>
 
     <string-array translatable="false" name="phone_type_values">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 40b8198..04bd7fe 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1164,11 +1164,11 @@
 
     <!-- Keep values in sync with android.telephony.TelephonyManager.WifiCallingChoices -->
     <!-- android.telephony.TelephonyManager.WifiCallingChoices.ALWAYS_USE -->
-    <string translatable="false" name="wifi_calling_choices_always_use">0</string>
+    <string translatable="false" name="wifi_calling_choices_always_use">ALWAYS_USE</string>
     <!-- android.telephony.TelephonyManager.WifiCallingChoices.NEVER_USE -->
-    <string translatable="false" name="wifi_calling_choices_never_use">1</string>
+    <string translatable="false" name="wifi_calling_choices_never_use">NEVER_USE</string>
     <!-- android.telephony.TelephonyManager.WifiCallingChoices.ASK_EVERY_TIME -->
-    <string translatable="false" name="wifi_calling_choices_ask_every_time">2</string>
+    <string translatable="false" name="wifi_calling_choices_ask_every_time">ASK_EVERY_TIME</string>
 
     <!-- Title of the dialog to select the phone type for the outgoing call. [CHAR LIMIT=NONE] -->
     <string name ="pick_outgoing_call_phone_type">Place call</string>
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 11dc35c..0d21f49 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -53,7 +53,6 @@
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
@@ -1754,22 +1753,14 @@
      * @see android.telephony.TelephonyManager.WifiCallingChoices
      */
     private String getWhenToMakeWifiCalls() {
-        int setting;
-        try {
-            setting = Settings.System.getInt(mPhone.getContext().getContentResolver(),
-                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS);
-        } catch (Settings.SettingNotFoundException e) {
-            setting = TelephonyManager.WifiCallingChoices.NEVER_USE;
-        }
-        return Integer.toString(setting);
+        return PhoneInterfaceManager.getWhenToMakeWifiCallsStr(mPhone.getContext());
     }
 
     /**
      * @see android.telephony.TelephonyManager.WifiCallingChoices
      */
     public void setWhenToMakeWifiCalls(String value) {
-        Settings.System.putInt(mPhone.getContext().getContentResolver(),
-               Settings.System.WHEN_TO_MAKE_WIFI_CALLS, Integer.valueOf(value));
+        PhoneInterfaceManager.setWhenToMakeWifiCallsStr(mPhone.getContext(), value);
     }
 
     // Gets the call options for SIP depending on whether SIP is allowed only
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 261e378..145f9a7 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -853,11 +853,11 @@
         return buf.toString();
     }
 
-    private void log(String msg) {
+    private static void log(String msg) {
         Log.d(LOG_TAG, "[PhoneIntfMgr] " + msg);
     }
 
-    private void loge(String msg) {
+    private static void loge(String msg) {
         Log.e(LOG_TAG, "[PhoneIntfMgr] " + msg);
     }
 
@@ -951,19 +951,70 @@
      * @see android.telephony.TelephonyManager.WifiCallingChoices
      */
     public int getWhenToMakeWifiCalls() {
-        try {
-            return Settings.System.getInt(mPhone.getContext().getContentResolver(),
-                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS);
-        } catch (Settings.SettingNotFoundException e) {
-            return TelephonyManager.WifiCallingChoices.NEVER_USE;
-        }
+        return getWhenToMakeWifiCalls(mPhone.getContext());
     }
 
     /**
      * @see android.telephony.TelephonyManager.WifiCallingChoices
      */
     public void setWhenToMakeWifiCalls(int preference) {
-        Settings.System.putInt(mPhone.getContext().getContentResolver(),
-                Settings.System.WHEN_TO_MAKE_WIFI_CALLS, preference);
+        setWhenToMakeWifiCalls(mPhone.getContext(), preference);
+    }
+
+    private static int getWhenToMakeWifiCalls(Context context) {
+        String setting = getWhenToMakeWifiCallsStr(context);
+        if (setting == null) {
+            return TelephonyManager.WifiCallingChoices.NEVER_USE;
+        } else if (setting.equals(context.getString(
+                R.string.wifi_calling_choices_always_use))) {
+            return TelephonyManager.WifiCallingChoices.ALWAYS_USE;
+        } else if (setting.equals(context.getString(
+                R.string.wifi_calling_choices_ask_every_time))) {
+            return TelephonyManager.WifiCallingChoices.ASK_EVERY_TIME;
+        } else if (setting.equals(context.getString(
+                R.string.wifi_calling_choices_never_use))) {
+            return TelephonyManager.WifiCallingChoices.NEVER_USE;
+        } else {
+            // Should be unreachable
+            return TelephonyManager.WifiCallingChoices.NEVER_USE;
+        }
+    }
+
+    private static void setWhenToMakeWifiCalls(Context context, int preference) {
+        int setting;
+        switch (preference) {
+            case TelephonyManager.WifiCallingChoices.ALWAYS_USE:
+                setting = R.string.wifi_calling_choices_always_use;
+                break;
+            case TelephonyManager.WifiCallingChoices.ASK_EVERY_TIME:
+                setting = R.string.wifi_calling_choices_ask_every_time;
+                break;
+            case TelephonyManager.WifiCallingChoices.NEVER_USE:
+                setting = R.string.wifi_calling_choices_never_use;
+                break;
+            default:
+                // Should be unreachable
+                setting = R.string.wifi_calling_choices_never_use;
+                break;
+        }
+        setWhenToMakeWifiCallsStr(context, context.getString(setting));
+    }
+
+    /** Public for utility use by other classes */
+    public static String getWhenToMakeWifiCallsStr(Context context) {
+        String str = Settings.System.getString(context.getContentResolver(),
+                Settings.System.WHEN_TO_MAKE_WIFI_CALLS);
+        if (str == null) {
+            str = context.getString(R.string.wifi_calling_choices_never_use);
+        }
+        if (DBG) log("getWhenToMakeWifiCallsStr, retrieving setting = " + str);
+        return str;
+    }
+
+    /** Public for utility use by other classes */
+    public static void setWhenToMakeWifiCallsStr(Context context, String setting) {
+        Settings.System.putString(context.getContentResolver(),
+                Settings.System.WHEN_TO_MAKE_WIFI_CALLS, setting);
+        if (DBG) log("setWhenToMakeWifiCallsStr, storing setting = " + setting);
     }
 }