commit f9e92733e130dc37ce2c592b36deab86008f5706
author Ihab Awad <ihab@google.com> Thu Dec 05 18:02:52 2013 -0800
committer Ihab Awad <ihab@google.com> Fri Dec 06 18:49:15 2013 -0800
tree 79c92e5d5b59c32effa99003cb218a2d5cdc1620
parent ca8ee7ddf4b29aa20d8c60f39eeb0840292e113c

Change representation of Wi-Fi calling setting to a String

Change-Id: I3977e8e19102dc026be4677a9e5d5e3c0d3c4a69

src/com/android/phone/CallFeaturesSetting.java

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