am ccc41a26: Merge change 23870 into eclair

Merge commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435' into eclair-plus-aosp

* commit 'ccc41a26b8e1d702c1ccec1642758bde52e1b435':
  Allow hasIccCard to be useable by any processes.

telephony/java/android/telephony/TelephonyManager.java

@@ -484,7 +484,12 @@ public class TelephonyManager {
      * @return true if a ICC card is present
      */
     public boolean hasIccCard() {
-        return PhoneFactory.getDefaultPhone().getIccCard().hasIccCard();
+        try {
+            return getITelephony().hasIccCard();
+        } catch (RemoteException ex) {
+            // Assume no ICC card if remote exception which shouldn't happen
+            return false;
+        }
     }
 
     /**

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -252,5 +252,10 @@ interface ITelephony {
       * Returns the network type
       */
     int getNetworkType();
+    
+    /**
+     * Return true if an ICC card is present
+     */
+    boolean hasIccCard();
 }