am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.

Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'

* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
  Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
This commit is contained in:
Wink Saville
2009-07-30 06:56:24 -07:00
committed by Android Git Automerger
2 changed files with 3 additions and 2 deletions

View File

@@ -256,7 +256,7 @@ public class TelephonyManager {
* No phone module
*
*/
public static final int PHONE_TYPE_NONE = 0;
public static final int PHONE_TYPE_NONE = RILConstants.NO_PHONE;
/**
* GSM phone

View File

@@ -68,8 +68,9 @@ public interface RILConstants {
int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;
int CDMA_CELL_BROADCAST_SMS_ENABLED = 0;
int CDMA_PHONE = 0;
int NO_PHONE = 0;
int GSM_PHONE = 1;
int CDMA_PHONE = 2;
int CDM_TTY_MODE_DISABLED = 0;
int CDM_TTY_MODE_ENABLED = 1;