From e40f66ffc11cfc7e1bbe3e4c2ae1cf6dbc24cc17 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Thu, 3 Sep 2009 13:34:04 -0700 Subject: Allow hasIccCard to be useable by any processes. This is accomplished by adding hasIccCard to ITelephony and do the implemenation in PhoneInterfaceManager.java. Then change TelephonyManager to use getITelephony().hasIccCard(). Change-Id: I26970fdf92a058502b8156a4f52c14e213217fc6 --- telephony/java/android/telephony/TelephonyManager.java | 7 ++++++- telephony/java/com/android/internal/telephony/ITelephony.aidl | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a690e3c..a744486 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/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; + } } /** diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 63c23ae..2328717 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/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(); } -- cgit v1.1