Merge "Make hasIccCard return true if RUIM card is present." (f0fa8416) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -672,12 +672,11 @@ public abstract class IccCard {
	* @return true if a ICC card is present		* @return true if a ICC card is present
	*/		*/
	public boolean hasIccCard() {		public boolean hasIccCard() {
	boolean isIccPresent;		if (mIccCardStatus == null) {
	if (mPhone.getPhoneName().equals("GSM")) {
	return mIccCardStatus.getCardState().isCardPresent();
	} else {
	// TODO: Make work with a CDMA device with a RUIM card.
	return false;		return false;
			} else {
			// Returns ICC card status for both GSM and CDMA mode
			return mIccCardStatus.getCardState().isCardPresent();
	}		}
	}		}