From b307c8945d4bf8d843445f3cc6d727f4e43d90f0 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Wed, 29 Jul 2009 10:25:09 -0700 Subject: [PATCH] Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE. 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. --- telephony/java/android/telephony/TelephonyManager.java | 2 +- .../java/com/android/internal/telephony/RILConstants.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index ba5c6e73680ab..ed9af663c682a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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 diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 7834018246215..1f4ce3d1d79e4 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -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;