summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wink Saville <wink@google.com> 2011-02-01 15:24:31 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-02-01 15:24:31 -0800
commit4b77bbd2ffc9d3a5c9dc5a03d98c7f94436173f7 (patch)
treea4f59726affa6f8ceb5f61513352382d1c2e196f
parent8b805ddc2eacaf7c5618619feee2154c4b18e9bf (diff)
parent9b9e6778dd9a0f04eb22e4fdd83d7d0d56b6b1a9 (diff)
Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 88d943695c20..01f2bae60d13 100644
--- 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();