drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb

Browse Source
This commit is contained in:
Wink Saville
2011-02-01 15:24:31 -08:00
committed by Android (Google) Code Review
parent 8b805ddc2e 9b9e6778dd
commit 4b77bbd2ff
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/TelephonyManager.java
View File

@ -286,6 +286,9 @@ public class TelephonyManager {
*/ */
public int getPhoneType() { public int getPhoneType() {
try{ try{
if (!isVoiceCapable()) {
return PHONE_TYPE_NONE;
}
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
return telephony.getActivePhoneType(); return telephony.getActivePhoneType();