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

Commit 969907f3 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

Merge commit 'f0fa8416' into gingerbread-plus-aosp

* commit 'f0fa8416':
  Make hasIccCard return true if RUIM card is present.
parents ff74e22b f0fa8416

telephony/java/com/android/internal/telephony/IccCard.java

+4 −5
Original line number Diff line number Diff line
@@ -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();

        }

    }