Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '4b77bbd2ffc9d3a5c9dc5a03d98c7f94436173f7':
  Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
This commit is contained in:
Wink Saville
2011-02-01 15:28:10 -08:00
committed by Android Git Automerger
parent 59927ce5ce 4b77bbd2ff
commit 566cd74f56
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();