From 213c853f40074633d61bb7705843a9f4a00513b3 Mon Sep 17 00:00:00 2001 From: Naveen Kalla Date: Sat, 26 Jun 2010 22:52:39 -0700 Subject: [PATCH] Make hasIccCard return true if RUIM card is present. Currently hasIccCard method works only for GSM phones with SIM/USIM cards. Extend that to RUIM as well. Change-Id: Iefbfc35025074e7414f4abdffea844e9e0325053 --- .../java/com/android/internal/telephony/IccCard.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/IccCard.java b/telephony/java/com/android/internal/telephony/IccCard.java index d3a34ecd39d0c..90f9e8cad1112 100644 --- a/telephony/java/com/android/internal/telephony/IccCard.java +++ b/telephony/java/com/android/internal/telephony/IccCard.java @@ -672,12 +672,11 @@ public abstract class IccCard { * @return true if a ICC card is present */ public boolean hasIccCard() { - boolean isIccPresent; - if (mPhone.getPhoneName().equals("GSM")) { - return mIccCardStatus.getCardState().isCardPresent(); - } else { - // TODO: Make work with a CDMA device with a RUIM card. + if (mIccCardStatus == null) { return false; + } else { + // Returns ICC card status for both GSM and CDMA mode + return mIccCardStatus.getCardState().isCardPresent(); } }