Merge "Allow tablets to send SMS if enabled in device overlays (1/2)"

src/com/android/settings/SmsDefaultDialog.java

@@ -64,7 +64,7 @@ public final class SmsDefaultDialog extends AlertActivity implements
 
     private boolean buildDialog(String packageName) {
         TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
-        if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE) {
+        if (!tm.isSmsCapable()) {
             // No phone, no SMS
             return false;
         }

src/com/android/settings/WirelessSettings.java

@@ -247,7 +247,7 @@ public class WirelessSettings extends RestrictedSettingsFragment
 
     private boolean isSmsSupported() {
         // Some tablet has sim card but could not do telephony operations. Skip those.
-        return (mTm.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE);
+        return mTm.isSmsCapable();
     }
 
     @Override