summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-01-31 17:33:05 -0800
committerWink Saville <wink@google.com>2011-01-31 17:33:05 -0800
commit9b9e6778dd9a0f04eb22e4fdd83d7d0d56b6b1a9 (patch)
tree8cd46f6c8ab4b5e26446dae05e08cba98b9ca22a /telephony/java/android
parent90a9ab56e0a41501cdd283c6e7022fd071334070 (diff)
downloadframeworks_base-9b9e6778dd9a0f04eb22e4fdd83d7d0d56b6b1a9.zip
frameworks_base-9b9e6778dd9a0f04eb22e4fdd83d7d0d56b6b1a9.tar.gz
frameworks_base-9b9e6778dd9a0f04eb22e4fdd83d7d0d56b6b1a9.tar.bz2
Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
bug: 3198435 Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
Diffstat (limited to 'telephony/java/android')
-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 88d9436..01f2bae 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();