diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index ed600ee..c211323 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -1344,18 +1344,18 @@
         if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext())) {
             prefSet.removePreference(wifiCallingSettings);
         } else {
-            int resId = R.string.wifi_calling_off_summary;
+            int resId = com.android.internal.R.string.wifi_calling_off_summary;
             if (ImsManager.isWfcEnabledByUser(mPhone.getContext())) {
                 int wfcMode = ImsManager.getWfcMode(mPhone.getContext());
                 switch (wfcMode) {
                     case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
-                        resId = R.string.wfc_mode_wifi_only_summary;
+                        resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
                         break;
                     case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
-                        resId = R.string.wfc_mode_cellular_preferred_summary;
+                        resId = com.android.internal.R.string.wfc_mode_cellular_preferred_summary;
                         break;
                     case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
-                        resId = R.string.wfc_mode_wifi_preferred_summary;
+                        resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;
                         break;
                     default:
                         if (DBG) log("Unexpected WFC mode value: " + wfcMode);
