am 4b77bbd2: Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb

* commit '4b77bbd2ffc9d3a5c9dc5a03d98c7f94436173f7': Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
2011-02-01 15:28:10 -08:00
parent 59927ce5ce 4b77bbd2ff
commit 566cd74f56
1 changed files with 3 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -286,6 +286,9 @@ public class TelephonyManager {
     */
    public int getPhoneType() {
        try{
+            if (!isVoiceCapable()) {
+                return PHONE_TYPE_NONE;
+            }
            ITelephony telephony = getITelephony();
            if (telephony != null) {
                return telephony.getActivePhoneType();