Merge "Make hasIccCard return true if RUIM card is present."

2010-07-29 14:37:48 -07:00
parent ce3ac5f029 213c853f40
commit f0fa8416e1
1 changed files with 4 additions and 5 deletions
--- 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();
        }
    }