From 65d62c774e42d8bf9a55ef50e153ffc9e277ef37 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Tue, 1 Sep 2009 15:39:08 -0700
Subject: [PATCH] Add hasIccCard to IccCard and TelephonyManager.

Expose the presence/absence of IccCards in the system.
This is needed to fix bug 2033811 which needs to show
some SIM menus in the Mms app and Contact apps only if
there is a SIM and on CDMA there is no sims yet.

The current implementation assumes CDMA never has an
IccCard this is true at the moment but needs to change.

Change-Id: I4167368e364623ea68e9b2778556e6d730b1e715
---
 api/current.xml                                     | 11 +++++++++++
 .../java/android/telephony/TelephonyManager.java    |  7 +++++++
 .../com/android/internal/telephony/IccCard.java     | 13 +++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/api/current.xml b/api/current.xml
index 46dfd89202907..8fad21363f8fe 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -117394,6 +117394,17 @@
  visibility="public"
 >
 </method>
+<method name="hasIccCard"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="isNetworkRoaming"
  return="boolean"
  abstract="false"
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index f3304a3fb3235..a690e3c049955 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -480,6 +480,13 @@ public class TelephonyManager {
     /** SIM card state: Ready */
     public static final int SIM_STATE_READY = 5;
 
+    /**
+     * @return true if a ICC card is present
+     */
+    public boolean hasIccCard() {
+        return PhoneFactory.getDefaultPhone().getIccCard().hasIccCard();
+    }
+
     /**
      * Returns a constant indicating the state of the
      * device SIM card.
diff --git a/telephony/java/com/android/internal/telephony/IccCard.java b/telephony/java/com/android/internal/telephony/IccCard.java
index 6657060228871..200340e7b9f0c 100644
--- a/telephony/java/com/android/internal/telephony/IccCard.java
+++ b/telephony/java/com/android/internal/telephony/IccCard.java
@@ -667,6 +667,19 @@ public abstract class IccCard {
         return false;
     }
 
+    /**
+     * @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.
+            return false;
+        }
+    }
+
     private void log(String msg) {
         Log.d(mLogTag, "[IccCard] " + msg);
     }