Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccc41a26 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23870 into eclair 

* changes:
  Allow hasIccCard to be useable by any processes.
parents 4879d0d0 e40f66ff

telephony/java/android/telephony/TelephonyManager.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -484,7 +484,12 @@ public class TelephonyManager { 
     * @return true if a ICC card is present

     * @return true if a ICC card is present

     */

     */

    public boolean hasIccCard() {

    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

+5 −0
Original line number Original line Diff line number Diff line
@@ -252,5 +252,10 @@ interface ITelephony { 
      * Returns the network type

      * Returns the network type

      */

      */

    int getNetworkType();

    int getNetworkType();

    

    /**

     * Return true if an ICC card is present

     */

    boolean hasIccCard();

}

}