Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp

* commit 'f0fa8416e13b2885b858b6974b101c70833e4729':
  Make hasIccCard return true if RUIM card is present.
This commit is contained in:
Jean-Baptiste Queru
2010-07-29 14:53:42 -07:00
committed by Android Git Automerger
parent ff74e22b59 f0fa8416e1
commit 969907f3f5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/com/android/internal/telephony/IccCard.java
View File

@@ -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();
}
}