commit 242184ca23b8ef70f5347874ac9b5c59cce36208
author Wink Saville <wink@google.com> Wed Apr 16 20:21:57 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 16 20:21:57 2014 +0000
tree dcbcddcd5dc970b1aa963a55c60c7771d4b403f4
parent 6829c48c36fceebb46989f8ee25c369fa5f7adeb
parent a3c0a535d15d897fc2b799811727a17eb79f773e

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

src/com/android/settings/SmsDefaultDialog.java

diff --git a/src/com/android/settings/SmsDefaultDialog.java b/src/com/android/settings/SmsDefaultDialog.java
index d9a6c5f..3a3848b 100644
--- a/src/com/android/settings/SmsDefaultDialog.java
+++ b/src/com/android/settings/SmsDefaultDialog.java
@@ -64,7 +64,7 @@
 
     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

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 65127b5..ef3a78f 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -247,7 +247,7 @@
 
     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