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

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

Browse Source 
This bug originally reported that PHONE_TYPE_CDMA needed to be 2 because
it was public. But as far as I can tell it has never been public and it
is still marked @hide so is not public now. There is a bug in that
PHONE_TYPE_NONE and PHONE_TYPE_CDMA were both 0. But this doesn't
appear to have been a problem because PHONE_TYPE_NONE doesn't looked to be
used anywhere except in TelephonyManagerTest.
This commit is contained in:
Wink Saville
2009-07-29 10:25:09 -07:00
parent 0869f7ef1e
commit b307c8945d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
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

3
telephony/java/com/android/internal/telephony/RILConstants.java
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;