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

Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb

Browse Source
This commit is contained in:
Wink Saville
2011-02-01 21:02:10 -08:00
committed by Android (Google) Code Review
parent 46ab5e13f2 9d72be3318
commit 1bf518d8b3
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/accounts/AccountManagerService.java
View File

@@ -1781,7 +1781,7 @@ public class AccountManagerService
// will return a different value, but we *don't* erase the
// passwords. We only erase them if it has a different
// subscriber ID once it's provisioned.
if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
if (telephonyManager.getCurrentPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
IBinder service = ServiceManager.checkService(Context.TELEPHONY_SERVICE);
if (service == null) {
Log.w(TAG, "call to checkService(TELEPHONY_SERVICE) failed");

8
telephony/java/android/telephony/CellLocation.java
View File

@@ -61,9 +61,9 @@ public abstract class CellLocation {
* @hide
*/
public static CellLocation newFromBundle(Bundle bundle) {
// TelephonyManager.getDefault().getPhoneType() handles the case when
// TelephonyManager.getDefault().getCurrentPhoneType() handles the case when
// ITelephony interface is not up yet.
switch(TelephonyManager.getDefault().getPhoneType()) {
switch(TelephonyManager.getDefault().getCurrentPhoneType()) {
case Phone.PHONE_TYPE_CDMA:
return new CdmaCellLocation(bundle);
case Phone.PHONE_TYPE_GSM:
@@ -89,9 +89,9 @@ public abstract class CellLocation {
*
*/
public static CellLocation getEmpty() {
// TelephonyManager.getDefault().getPhoneType() handles the case when
// TelephonyManager.getDefault().getCurrentPhoneType() handles the case when
// ITelephony interface is not up yet.
switch(TelephonyManager.getDefault().getPhoneType()) {
switch(TelephonyManager.getDefault().getCurrentPhoneType()) {
case Phone.PHONE_TYPE_CDMA:
return new CdmaCellLocation();
case Phone.PHONE_TYPE_GSM:

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

@@ -276,19 +276,18 @@ public class TelephonyManager {
public static final int PHONE_TYPE_SIP = Phone.PHONE_TYPE_SIP;
/**
* Returns a constant indicating the device phone type. This
* indicates the type of radio used to transmit voice calls.
* Returns the current phone type.
* TODO: This is a last minute change and hence hidden.
*
* @see #PHONE_TYPE_NONE
* @see #PHONE_TYPE_GSM
* @see #PHONE_TYPE_CDMA
* @see #PHONE_TYPE_SIP
*
* {@hide}
*/
public int getPhoneType() {
public int getCurrentPhoneType() {
try{
if (!isVoiceCapable()) {
return PHONE_TYPE_NONE;
}
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getActivePhoneType();
@@ -307,6 +306,21 @@ public class TelephonyManager {
}
}
/**
* Returns a constant indicating the device phone type. This
* indicates the type of radio used to transmit voice calls.
*
* @see #PHONE_TYPE_NONE
* @see #PHONE_TYPE_GSM
* @see #PHONE_TYPE_CDMA
* @see #PHONE_TYPE_SIP
*/
public int getPhoneType() {
if (!isVoiceCapable()) {
return PHONE_TYPE_NONE;
}
return getCurrentPhoneType();
}
private int getPhoneTypeFromProperty() {
int type =